diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2013-10-18 11:41:08 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2013-10-18 11:41:08 +0200 |
| commit | 715f5a32fb06b67ba512f6e28019b2f0b2df15d4 (patch) | |
| tree | a093adaf8ab4a9d751d181c3f42097fb27fbff21 /src | |
| parent | a8077597b227e9d72ab7eb59405103761ae5d698 (diff) | |
| download | openlmi-providers-715f5a32fb06b67ba512f6e28019b2f0b2df15d4.tar.gz openlmi-providers-715f5a32fb06b67ba512f6e28019b2f0b2df15d4.tar.xz openlmi-providers-715f5a32fb06b67ba512f6e28019b2f0b2df15d4.zip | |
journald: Rename common test module to prevent conflict
When running nosetest over all tests, modules having same name are not re-imported.
Diffstat (limited to 'src')
| -rw-r--r-- | src/journald/test/TestIndications.py | 2 | ||||
| -rw-r--r-- | src/journald/test/TestIterators.py | 2 | ||||
| -rw-r--r-- | src/journald/test/TestWriting.py | 2 | ||||
| -rw-r--r-- | src/journald/test/journald_common.py (renamed from src/journald/test/common.py) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/journald/test/TestIndications.py b/src/journald/test/TestIndications.py index 9e1307e..3b8dd0f 100644 --- a/src/journald/test/TestIndications.py +++ b/src/journald/test/TestIndications.py @@ -17,7 +17,7 @@ # Authors: Tomas Bzatek <tbzatek@redhat.com> # -from common import JournalBase +from journald_common import JournalBase import time import syslog diff --git a/src/journald/test/TestIterators.py b/src/journald/test/TestIterators.py index 10101f3..49eceef 100644 --- a/src/journald/test/TestIterators.py +++ b/src/journald/test/TestIterators.py @@ -17,7 +17,7 @@ # Authors: Tomas Bzatek <tbzatek@redhat.com> # -from common import JournalBase +from journald_common import JournalBase import pywbem CIM_MESSAGELOG_ITERATOR_RESULT_SUCCESS = 0 diff --git a/src/journald/test/TestWriting.py b/src/journald/test/TestWriting.py index f6b439c..6ac4af8 100644 --- a/src/journald/test/TestWriting.py +++ b/src/journald/test/TestWriting.py @@ -17,7 +17,7 @@ # Authors: Tomas Bzatek <tbzatek@redhat.com> # -from common import JournalBase +from journald_common import JournalBase import time import pywbem diff --git a/src/journald/test/common.py b/src/journald/test/journald_common.py index f2d0942..f2d0942 100644 --- a/src/journald/test/common.py +++ b/src/journald/test/journald_common.py |