Fixes python tests

hemio-ev · Aug 11, 2019 · 2fae1df · 2fae1df
1 parent e9bfe6e
commit 2fae1df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/test/test_domain.py b/test/test_domain.py
@@ -5,13 +5,12 @@ def test_domains():
     xs = {
      'domains':
      [
-      ('hamsql-test', 'dep', 'domain-dependency', 'int4', None, None) ,
       ('hamsql-test', 'A1', 'domain-install', 'int4', None, None) ,
       ('hamsql-test', 'A2', 'domain-install', 'A1', None, None) ,
-      ('hamsql-test', 'B1', 'domain-install', 'int4', None, None) ,
-      ('hamsql-test', 'L1', 'domain-install', 'varchar', 25, None) ,
+      ('hamsql-test', 'B1', 'domain-install', 'B2', None, None) ,
+      ('hamsql-test', 'C1', 'domain-install', 'varchar', 25, None) ,
       ('hamsql-test', 'D1', 'domain-install', 'varchar', None, None) ,
-      ('hamsql-test', 'B2', 'domain-install', 'B1', None, None) ,
+      ('hamsql-test', 'B2', 'domain-install', 'int4', None, None) ,
      ],
 
      'tables':
@@ -48,11 +47,10 @@ def test_domains():
       [
        ('hamsql-test', 'A1', 'domain-install', 'int4', None, None) ,
        ('hamsql-test', 'A2', 'domain-install', 'A1', None, None) ,
-       ('hamsql-test', 'B1', 'domain-install', 'int4', None, None) ,
-       ('hamsql-test', 'B2', 'domain-install', 'B1', None, None) ,
+       ('hamsql-test', 'B1', 'domain-install', 'B2', None, None) ,
+       ('hamsql-test', 'B2', 'domain-install', 'int4', None, None) ,
+       ('hamsql-test', 'C1', 'domain-install', 'varchar', 25, None) ,
        ('hamsql-test', 'D2', 'domain-install', 'varchar', None, None) ,
-       ('hamsql-test', 'L1', 'domain-install', 'varchar', 25, None) ,
-       ('hamsql-test', 'dep', 'domain-dependency', 'int4', None, None) ,
       ]
     })
 

diff --git a/test/utils.py b/test/utils.py
@@ -10,7 +10,7 @@ def run(cmd, setup, delete_db=False, capture=False, invalid_connection=False, ar
     global dburl
 
     settings = {}
-    path = os.path.dirname(__file__) + '/../dist/build/hamsql/hamsql'
+    path = 'hamsql'
     params = [path, cmd, '-s', 'setups/' + setup]
 
     if invalid_connection: