Local security-master changes

[dak.git] / dak / test / 004 / test.py

diff --git a/dak/test/004/test.py b/dak/test/004/test.py
index be272ba3b93f60da9df71772cfdc407c5941c9d0..4aa6b48079f00d6928467e7b4343e70b17527cd3 100755 (executable)
--- a/dak/test/004/test.py
+++ b/dak/test/004/test.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
 # Check utils.extract_component_from_section()
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: test.py,v 1.3 2002-10-16 02:47:32 troup Exp $
+# Copyright (C) 2000, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,17 +19,17 @@
 
 ################################################################################
 
-import os, sys;
+import os, sys
 
-sys.path.append(os.path.abspath('../../'));
+sys.path.append(os.path.abspath('../../'))
 
 import utils
 
 ################################################################################
 
 def fail(message):
-    sys.stderr.write("%s\n" % (message));
-    sys.exit(1);
+    sys.stderr.write("%s\n" % (message))
+    sys.exit(1)
 
 ################################################################################
 
@@ -47,75 +46,75 @@ def fail(message):
 # [6] Everything else is case sensitive.
 
 def test(input, output):
-    result = utils.extract_component_from_section(input);
+    result = utils.extract_component_from_section(input)
     if result != output:
-        fail ("%s -> %r [should have been %r]" % (input, result, output));
+        fail ("%s -> %r [should have been %r]" % (input, result, output))
 
 def main ():
     # Err, whoops?  should probably be "utils", "main"...
-    input = "main/utils"; output = ("main/utils", "main");
-    test (input, output);
+    input = "main/utils"; output = ("main/utils", "main")
+    test (input, output)
 
 
     # Validate #3
-    input = "utils"; output = ("utils", "main");
-    test (input, output);
+    input = "utils"; output = ("utils", "main")
+    test (input, output)
 
-    input = "non-free/libs"; output = ("non-free/libs", "non-free");
-    test (input, output);
+    input = "non-free/libs"; output = ("non-free/libs", "non-free")
+    test (input, output)
 
-    input = "contrib/net"; output = ("contrib/net", "contrib");
-    test (input, output);
+    input = "contrib/net"; output = ("contrib/net", "contrib")
+    test (input, output)
 
 
     # Validate #3 with a prefix
-    input = "non-US"; output = ("non-US", "non-US/main");
-    test (input, output);
+    input = "non-US"; output = ("non-US", "non-US/main")
+    test (input, output)
 
 
     # Validate #4
-    input = "main"; output = ("main", "main");
-    test (input, output);
+    input = "main"; output = ("main", "main")
+    test (input, output)
 
-    input = "contrib"; output = ("contrib", "contrib");
-    test (input, output);
+    input = "contrib"; output = ("contrib", "contrib")
+    test (input, output)
 
-    input = "non-free"; output = ("non-free", "non-free");
-    test (input, output);
+    input = "non-free"; output = ("non-free", "non-free")
+    test (input, output)
 
 
     # Validate #4 with a prefix
-    input = "non-US/main"; output = ("non-US/main", "non-US/main");
-    test (input, output);
+    input = "non-US/main"; output = ("non-US/main", "non-US/main")
+    test (input, output)
 
-    input = "non-US/contrib"; output = ("non-US/contrib", "non-US/contrib");
-    test (input, output);
+    input = "non-US/contrib"; output = ("non-US/contrib", "non-US/contrib")
+    test (input, output)
 
-    input = "non-US/non-free"; output = ("non-US/non-free", "non-US/non-free");
-    test (input, output);
+    input = "non-US/non-free"; output = ("non-US/non-free", "non-US/non-free")
+    test (input, output)
 
 
     # Validate #5
-    input = "non-us"; output = ("non-us", "non-US/main");
-    test (input, output);
+    input = "non-us"; output = ("non-us", "non-US/main")
+    test (input, output)
 
-    input = "non-us/contrib"; output = ("non-us/contrib", "non-US/contrib");
-    test (input, output);
+    input = "non-us/contrib"; output = ("non-us/contrib", "non-US/contrib")
+    test (input, output)
 
 
     # Validate #6 (section)
-    input = "utIls"; output = ("utIls", "main");
-    test (input, output);
+    input = "utIls"; output = ("utIls", "main")
+    test (input, output)
 
     # Others..
-    input = "non-US/libs"; output = ("non-US/libs", "non-US/main");
-    test (input, output);
-    input = "non-US/main/libs"; output = ("non-US/main/libs", "non-US/main");
-    test (input, output);
-    input = "non-US/contrib/libs"; output = ("non-US/contrib/libs", "non-US/contrib");
-    test (input, output);
-    input = "non-US/non-free/libs"; output = ("non-US/non-free/libs", "non-US/non-free");
-    test (input, output);
+    input = "non-US/libs"; output = ("non-US/libs", "non-US/main")
+    test (input, output)
+    input = "non-US/main/libs"; output = ("non-US/main/libs", "non-US/main")
+    test (input, output)
+    input = "non-US/contrib/libs"; output = ("non-US/contrib/libs", "non-US/contrib")
+    test (input, output)
+    input = "non-US/non-free/libs"; output = ("non-US/non-free/libs", "non-US/non-free")
+    test (input, output)
 
 ################################################################################