Test: Allow test_fs flag on Solaris

opensvc · Feb 17, 2020 · 40f4920 · 40f4920
1 parent 68f4366
commit 40f4920
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/tests/test_fs_flag.py b/lib/tests/test_fs_flag.py
@@ -8,15 +8,17 @@
 @pytest.mark.ci
 class TestFsFlagFileName:
     @staticmethod
-    @pytest.mark.parametrize('fs_flag_class,namespace,expected_flag_file', [
-        (FsFlagLinux, 'ns1', '/dev/shm/opensvc/ns1/svc/svcname/fs#flag1.flag'),
-        (FsFlagLinux, None, '/dev/shm/opensvc/svc/svcname/fs#flag1.flag'),
-        (FsFlagSunOS, 'ns2', '/var/run/opensvc/ns2/svc/svcname/fs#flag1.flag'),
-        (FsFlagSunOS, None, '/var/run/opensvc/svc/svcname/fs#flag1.flag'),
+    @pytest.mark.parametrize('fs_flag_class,namespace,expected_flag_files', [
+        (FsFlagLinux, 'ns1', ['/dev/shm/opensvc/ns1/svc/svcname/fs#flag1.flag']),
+        (FsFlagLinux, None, ['/dev/shm/opensvc/svc/svcname/fs#flag1.flag']),
+        (FsFlagSunOS, 'ns2', ['/var/run/opensvc/ns2/svc/svcname/fs#flag1.flag',
+                              '/system/volatile/opensvc/ns2/svc/svcname/fs#flag1.flag']),
+        (FsFlagSunOS, None, ['/var/run/opensvc/svc/svcname/fs#flag1.flag',
+                             '/system/volatile/opensvc/svc/svcname/fs#flag1.flag']),
     ])
-    def test_is_correctly_defined(fs_flag_class, namespace, expected_flag_file):
+    def test_is_correctly_defined(fs_flag_class, namespace, expected_flag_files):
         svc = Svc('svcname', namespace=namespace, volatile=True)
         fs_flag = fs_flag_class(rid='fs#flag1')
         svc += fs_flag
         assert fs_flag.type == 'fs.flag'
-        assert fs_flag.flag_f == expected_flag_file
+        assert fs_flag.flag_f in expected_flag_files