X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=test%2F004%2Ftest.py;h=be272ba3b93f60da9df71772cfdc407c5941c9d0;hb=dd866b48805fee669a51b57dd9434b4251cb81e3;hp=e0a02d6031f45eb8a95a2287b7501a765e5131ba;hpb=daaee3bcc68b5702b5cea8f14dfa6c10cf304ff0;p=dak.git

diff --git a/test/004/test.py b/test/004/test.py
index e0a02d60..be272ba3 100755
--- a/test/004/test.py
+++ b/test/004/test.py
@@ -2,7 +2,7 @@
 
 # Check utils.extract_component_from_section()
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: test.py,v 1.1 2001-06-10 16:35:04 troup Exp $
+# $Id: test.py,v 1.3 2002-10-16 02:47:32 troup Exp $
 
 # 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,7 +20,7 @@
 
 ################################################################################
 
-import os, string, sys
+import os, sys;
 
 sys.path.append(os.path.abspath('../../'));
 
@@ -31,7 +31,7 @@ import utils
 def fail(message):
     sys.stderr.write("%s\n" % (message));
     sys.exit(1);
-    
+
 ################################################################################
 
 # prefix: non-US
@@ -49,7 +49,7 @@ def fail(message):
 def test(input, output):
     result = utils.extract_component_from_section(input);
     if result != output:
-        fail ("%s -> %s [should have been %s]" % (input, repr(result), repr(output)));
+        fail ("%s -> %r [should have been %r]" % (input, result, output));
 
 def main ():
     # Err, whoops?  should probably be "utils", "main"...
@@ -107,6 +107,16 @@ def main ():
     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);
+
 ################################################################################
 
 if __name__ == '__main__':