Revamp testsuite.

1 files changed, 14 insertions, 14 deletions

diff --git a/utils/new-publish/test/test_publish.py b/utils/new-publish/test/test_publish.py
index 3e590a1..e8692ad 100644
--- a/utils/new-publish/test/test_publish.py
+++ b/utils/new-publish/test/test_publish.py
@@ -1,5 +1,5 @@
 import os
-import publish
+import publib
 
 
 def data_path():
@@ -7,45 +7,45 @@ def data_path():
     return "test/data/"
 
 def test_file_list1():
-    l = publish.get_file_list([data_path() + "/*"])
+    l = publib.get_file_list([data_path() + "/*"])
     assert l == ['test/data/top_file'], l
 
 def test_file_list2():
-    l = publish.get_file_list([data_path() + "/*/*"])
+    l = publib.get_file_list([data_path() + "/*/*"])
     assert l == ['test/data/dir1/dir1_file', 'test/data/dir2/dir2_file'], l
 
 def test_file_list3():
     d = data_path()
-    l = publish.get_file_list([d + "/*", d + "/*/*"])
+    l = publib.get_file_list([d + "/*", d + "/*/*"])
     assert l == ['test/data/top_file', 'test/data/dir1/dir1_file', 'test/data/dir2/dir2_file'], l
 
 def test_file_list_order():
     d = data_path()
-    l = publish.get_file_list([d + "*", d + "dir2/*", d + "dir1/*"])
+    l = publib.get_file_list([d + "*", d + "dir2/*", d + "dir1/*"])
     assert l == ['test/data/top_file', 'test/data/dir1/dir1_file', 'test/data/dir2/dir2_file'], l
 
 def test_common_prefix():
-    v = publish.common_path_prefix("a", "b")
+    v = publib.common_path_prefix("a", "b")
     assert v == ([], ["a"]), v
-    v = publish.common_path_prefix("a", "a")
+    v = publib.common_path_prefix("a", "a")
     assert v == (["a"], []), v
-    v = publish.common_path_prefix("a/c", "a/b")
+    v = publib.common_path_prefix("a/c", "a/b")
     assert v == (["a"], ["c"]), v
 
 def test_dir_creation():
-    l = publish.make_dir_struct(["file1"])
+    l = publib.make_dir_struct(["file1"], "/uploads")
     assert l == []
-    l = publish.make_dir_struct(["file1", "dir2/f", "dir1/f"])
+    l = publib.make_dir_struct(["file1", "dir2/f", "dir1/f"], "/uploads")
     assert l == ['/uploads/dir1', '/uploads/dir2'], l
-    l = publish.make_dir_struct(["dir/subdir/f", "dir/f"])
+    l = publib.make_dir_struct(["dir/subdir/f", "dir/f"], "/uploads")
     assert l == ['/uploads/dir', '/uploads/dir/subdir'], l
-    l = publish.make_dir_struct(["dir/s1/s2/f", "dir/f"])
+    l = publib.make_dir_struct(["dir/s1/s2/f", "dir/f"], "/uploads")
     assert l == ['/uploads/dir', '/uploads/dir/s1', '/uploads/dir/s1/s2'], l
 
 
 def test_ftp_script_trivial():
-    l = publish.make_upload_script(["file1"])
+    l = publib.make_upload_script(["file1"], "/uploads")
     assert l == ['cd /uploads', 'put file1'], l
-    l = publish.make_upload_script(["dir/file1"])
+    l = publib.make_upload_script(["dir/file1"], "/uploads")
     assert l == ['cd /uploads/dir', 'put dir/file1'], l