tests: use shared base class in provider tests

Done for: Account, Journald and LogicalFile

2 files changed, 21 insertions, 28 deletions

diff --git a/src/logicalfile/test/test_base.py b/src/logicalfile/test/test_base.py
index 3cd6531..0e94d53 100644
--- a/src/logicalfile/test/test_base.py
+++ b/src/logicalfile/test/test_base.py
@@ -16,27 +16,20 @@
 #
 # Authors: Jan Synacek <jsynacek@redhat.com>
 
-import pywbem
 import os
-import socket
-import unittest
 import subprocess
 import pyudev
 
-class LogicalFileTestBase(unittest.TestCase):
+from lmi.test import base
+
+class LogicalFileTestBase(base.LmiTestCase):
     """
     Base class for all LogicalFile tests.
     """
 
-    SYSTEM_CLASS_NAME = "PG_ComputerSystem"
-    SYSTEM_NAME = socket.getfqdn()
-
     @classmethod
     def setUpClass(cls):
-        cls.url = os.environ.get("LMI_CIMOM_URL", "https://localhost:5989")
-        cls.username = os.environ.get("LMI_CIMOM_USERNAME", "root")
-        cls.password = os.environ.get("LMI_CIMOM_PASSWORD", "")
-        cls.wbemconnection = pywbem.WBEMConnection(cls.url, (cls.username, cls.password))
+        base.LmiTestCase.setUpClass.im_func(cls)
         cls.testdir = os.environ.get("LMI_LOGICALFILE_TESTDIR", "/var/tmp/logicalfile-tests")
         cls.selinux_enabled = True
         try:
diff --git a/src/logicalfile/test/test_basic.py b/src/logicalfile/test/test_basic.py
index e477dee..d813f1a 100644
--- a/src/logicalfile/test/test_basic.py
+++ b/src/logicalfile/test/test_basic.py
@@ -70,7 +70,7 @@ class TestLogicalFile(LogicalFileTestBase):
         self.cop = pywbem.CIMInstanceName(classname='LMI_UnixDirectory',
                                           namespace='root/cimv2',
                                           keybindings={
-                                              'CSCreationClassName':self.SYSTEM_CLASS_NAME,
+                                              'CSCreationClassName':self.system_cs_name,
                                               'CSName':self.SYSTEM_NAME,
                                               'FSCreationClassName':'LMI_LocalFileSystem',
                                               'FSName':self.fsname,
@@ -154,7 +154,7 @@ class TestLogicalFile(LogicalFileTestBase):
                     cop_file = pywbem.CIMInstanceName(classname=f['class'],
                                                   namespace='root/cimv2',
                                                   keybindings={
-                                                      'CSCreationClassName':self.SYSTEM_CLASS_NAME,
+                                                      'CSCreationClassName':self.system_cs_name,
                                                       'CSName':self.SYSTEM_NAME,
                                                       'FSCreationClassName':'LMI_LocalFileSystem',
                                                       'FSName':self.fsname,
@@ -180,7 +180,7 @@ class TestLogicalFile(LogicalFileTestBase):
                                                AssocClass=assoc_class,
                                                Role='PartComponent',
                                                ResultRole='GroupComponent',
-                                               ResultClass=self.SYSTEM_CLASS_NAME)
+                                               ResultClass=self.system_cs_name)
                     self.assertEquals(assocs_file, [])
 
         ### References and ReferenceNames
@@ -198,7 +198,7 @@ class TestLogicalFile(LogicalFileTestBase):
                     cop_file = pywbem.CIMInstanceName(classname=f['class'],
                                                   namespace='root/cimv2',
                                                   keybindings={
-                                                      'CSCreationClassName':self.SYSTEM_CLASS_NAME,
+                                                      'CSCreationClassName':self.system_cs_name,
                                                       'CSName':self.SYSTEM_NAME,
                                                       'FSCreationClassName':'LMI_LocalFileSystem',
                                                       'FSName':self.fsname,
@@ -250,14 +250,14 @@ class TestLogicalFile(LogicalFileTestBase):
                                       AssocClass=assoc_class,
                                       Role='SystemElement',
                                       ResultRole='SameElement',
-                                      ResultClass=self.SYSTEM_CLASS_NAME)
+                                      ResultClass=self.system_cs_name)
                 self.assertEquals(assocs_ident, [])
 
                 ## SameElement - CIM_LogicalFile
                 cop_ident = pywbem.CIMInstanceName(classname='LMI_UnixFile',
                                                    namespace='root/cimv2',
                                                    keybindings={
-                                                       'CSCreationClassName':self.SYSTEM_CLASS_NAME,
+                                                       'CSCreationClassName':self.system_cs_name,
                                                        'CSName':self.SYSTEM_NAME,
                                                        'FSCreationClassName':'LMI_LocalFileSystem',
                                                        'FSName':self.fsname,
@@ -283,7 +283,7 @@ class TestLogicalFile(LogicalFileTestBase):
                                       AssocClass=assoc_class,
                                       Role='SameElement',
                                       ResultRole='SystemElement',
-                                      ResultClass=self.SYSTEM_CLASS_NAME)
+                                      ResultClass=self.system_cs_name)
                 self.assertEquals(assocs_ident, [])
 
         ### References and ReferenceNames
@@ -308,7 +308,7 @@ class TestLogicalFile(LogicalFileTestBase):
                 cop_ident = pywbem.CIMInstanceName(classname='LMI_UnixFile',
                                                    namespace='root/cimv2',
                                                    keybindings={
-                                                       'CSCreationClassName':self.SYSTEM_CLASS_NAME,
+                                                       'CSCreationClassName':self.system_cs_name,
                                                        'CSName':self.SYSTEM_NAME,
                                                        'FSCreationClassName':'LMI_LocalFileSystem',
                                                        'FSName':self.fsname,
@@ -332,10 +332,10 @@ class TestLogicalFile(LogicalFileTestBase):
                                   AssocClass=assoc_class,
                                   Role='PartComponent',
                                   ResultRole='GroupComponent',
-                                  ResultClass=self.SYSTEM_CLASS_NAME)
+                                  ResultClass=self.system_cs_name)
             self.assertEquals(len(assocs), 1)
             system = assocs[0]
-            self.assertEquals(system['CreationClassName'], self.SYSTEM_CLASS_NAME)
+            self.assertEquals(system['CreationClassName'], self.system_cs_name)
             self.assertEquals(system['Name'], self.SYSTEM_NAME)
             # wrong Role
             assocs = assoc_method(cop, AssocClass=assoc_class, Role='GroupComponent')
@@ -372,7 +372,7 @@ class TestLogicalFile(LogicalFileTestBase):
                                   AssocClass=assoc_class,
                                   Role='GroupComponent',
                                   ResultRole='PartComponent',
-                                  ResultClass=self.SYSTEM_CLASS_NAME)
+                                  ResultClass=self.system_cs_name)
             self.assertEquals(assocs, [])
 
 
@@ -382,7 +382,7 @@ class TestLogicalFile(LogicalFileTestBase):
             assocs = assoc_method(cop, ResultClass=assoc_class)
             self.assertEquals(len(assocs), 1)
             system = assocs[0]['GroupComponent']
-            self.assertEquals(system['CreationClassName'], self.SYSTEM_CLASS_NAME)
+            self.assertEquals(system['CreationClassName'], self.system_cs_name)
             self.assertEquals(system['Name'], self.SYSTEM_NAME)
 
             ## GroupComponent - LMI_UnixDirectory
@@ -395,9 +395,9 @@ class TestLogicalFile(LogicalFileTestBase):
         self.assertEquals(len(insts), 1)
         system = insts[0]['GroupComponent']
         rootdir = insts[0]['PartComponent']
-        self.assertEquals(system['CreationClassName'], self.SYSTEM_CLASS_NAME)
+        self.assertEquals(system['CreationClassName'], self.system_cs_name)
         self.assertEquals(system['Name'], self.SYSTEM_NAME)
-        self.assertEquals(rootdir['CSCreationClassName'], self.SYSTEM_CLASS_NAME)
+        self.assertEquals(rootdir['CSCreationClassName'], self.system_cs_name)
         self.assertEquals(rootdir['CSName'], self.SYSTEM_NAME)
         self.assertEquals(rootdir['Name'], '/')
 
@@ -411,9 +411,9 @@ class TestLogicalFile(LogicalFileTestBase):
         self.assertTrue(inst is not None)
         system = inst['GroupComponent']
         rootdir = inst['PartComponent']
-        self.assertEquals(system['CreationClassName'], self.SYSTEM_CLASS_NAME)
+        self.assertEquals(system['CreationClassName'], self.system_cs_name)
         self.assertEquals(system['Name'], self.SYSTEM_NAME)
-        self.assertEquals(rootdir['CSCreationClassName'], self.SYSTEM_CLASS_NAME)
+        self.assertEquals(rootdir['CSCreationClassName'], self.system_cs_name)
         self.assertEquals(rootdir['CSName'], self.SYSTEM_NAME)
         self.assertEquals(rootdir['Name'], '/')
 
@@ -463,7 +463,7 @@ class TestLogicalFile(LogicalFileTestBase):
         cop = pywbem.CIMInstanceName(classname=clsname,
                                      namespace='root/cimv2',
                                      keybindings={
-                                         'CSCreationClassName':self.SYSTEM_CLASS_NAME,
+                                         'CSCreationClassName':self.system_cs_name,
                                          'CSName':self.SYSTEM_NAME,
                                          'FSCreationClassName':'',
                                          'FSName':'',