projects
/
pithos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into packaging
[pithos]
/
snf-pithos-tools
/
pithos
/
tools
/
test.py
diff --git
a/pithos/tools/pithos-test
b/snf-pithos-tools/pithos/tools/test.py
similarity index 99%
rename from
pithos/tools/pithos-test
rename to
snf-pithos-tools/pithos/tools/test.py
index
d5cfdbd
..
35d5e9c
100755
(executable)
--- a/
pithos/tools/pithos-test
+++ b/
snf-pithos-tools/pithos/tools/test.py
@@
-2114,8
+2114,14
@@
o_names = ['kate.jpg',
'photos/plants/rose.jpg',
'photos/me.jpg']
'photos/plants/rose.jpg',
'photos/me.jpg']
-if __name__ == "__main__":
+
+def main():
if get_user() == 'test':
unittest.main()
else:
print 'Will not run tests as any other user except \'test\' (current user: %s).' % get_user()
if get_user() == 'test':
unittest.main()
else:
print 'Will not run tests as any other user except \'test\' (current user: %s).' % get_user()
+
+
+if __name__ == "__main__":
+ main()
+