projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial port to python3
[htsworkflow.git]
/
htsworkflow
/
util
/
test
/
test_alphanum.py
diff --git
a/htsworkflow/util/test/test_alphanum.py
b/htsworkflow/util/test/test_alphanum.py
index 29a53859a6bcb70699f0e028039759c15882540d..e6ad5bd644784f87520d2c2b0d061146cb1e08df 100644
(file)
--- a/
htsworkflow/util/test/test_alphanum.py
+++ b/
htsworkflow/util/test/test_alphanum.py
@@
-1,6
+1,6
@@
import copy
import os
import copy
import os
-from unittest
2
import TestCase
+from unittest import TestCase
from htsworkflow.util.alphanum import alphanum
from htsworkflow.util.alphanum import alphanum
@@
-11,9
+11,9
@@
class testAlphanum(TestCase):
scratch = copy.copy(unsorted)
scratch.sort(alphanum)
scratch = copy.copy(unsorted)
scratch.sort(alphanum)
- for i in
x
range(len(scratch)):
+ for i in range(len(scratch)):
self.failIfEqual(scratch[i], unsorted[i])
self.failIfEqual(scratch[i], unsorted[i])
- for i in
x
range(len(scratch)):
+ for i in range(len(scratch)):
self.failUnlessEqual(scratch[i], sorted[i])
def test_numbers(self):
self.failUnlessEqual(scratch[i], sorted[i])
def test_numbers(self):
@@
-22,9
+22,9
@@
class testAlphanum(TestCase):
scratch = copy.copy(unsorted)
scratch.sort(alphanum)
scratch = copy.copy(unsorted)
scratch.sort(alphanum)
- for i in
x
range(len(scratch)):
+ for i in range(len(scratch)):
self.failIfEqual(scratch[i], unsorted[i])
self.failIfEqual(scratch[i], unsorted[i])
- for i in
x
range(len(scratch)):
+ for i in range(len(scratch)):
self.failUnlessEqual(scratch[i], sorted[i])
def test_long_names(self):
self.failUnlessEqual(scratch[i], sorted[i])
def test_long_names(self):
@@
-42,12
+42,12
@@
class testAlphanum(TestCase):
def suite():
def suite():
- from unittest
2
import TestSuite, defaultTestLoader
+ from unittest import TestSuite, defaultTestLoader
suite = TestSuite()
suite.addTests(defaultTestLoader.loadTestsFromTestCase(testAlphanum))
return suite
if __name__ == "__main__":
suite = TestSuite()
suite.addTests(defaultTestLoader.loadTestsFromTestCase(testAlphanum))
return suite
if __name__ == "__main__":
- from unittest
2
import main
+ from unittest import main
main(defaultTest="suite")
main(defaultTest="suite")