chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78a661f
)
tests: we now replace "buildToolsVersion var" too
author
Daniel Martí
<mvdan@mvdan.cc>
Sat, 24 Oct 2015 16:47:43 +0000
(18:47 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Sat, 24 Oct 2015 16:47:43 +0000
(18:47 +0200)
See
d706cfa7d8a
tests/build.TestCase
patch
|
blob
|
history
diff --git
a/tests/build.TestCase
b/tests/build.TestCase
index ee26932b05c711137b0e8bc2eaa885fc269693cd..0665bfffa7f41b3c2de249a7957b5fb74b046586 100755
(executable)
--- a/
tests/build.TestCase
+++ b/
tests/build.TestCase
@@
-59,18
+59,14
@@
class BuildTest(unittest.TestCase):
fdroidserver.build.config['build_tools'] = teststring
fdroidserver.build.adapt_gradle(testsdir)
pattern = re.compile("buildToolsVersion[\s=]+'%s'\s+" % teststring)
fdroidserver.build.config['build_tools'] = teststring
fdroidserver.build.adapt_gradle(testsdir)
pattern = re.compile("buildToolsVersion[\s=]+'%s'\s+" % teststring)
- for
f
in ('source-files/fdroid/fdroidclient/build.gradle',
+ for
p
in ('source-files/fdroid/fdroidclient/build.gradle',
'source-files/Zillode/syncthing-silk/build.gradle',
'source-files/open-keychain/open-keychain/build.gradle',
'source-files/Zillode/syncthing-silk/build.gradle',
'source-files/open-keychain/open-keychain/build.gradle',
- 'source-files/osmandapp/osmand/build.gradle'):
- with open(os.path.join(testsdir, f), 'r') as f:
+ 'source-files/osmandapp/osmand/build.gradle',
+ 'source-files/open-keychain/open-keychain/OpenKeychain/build.gradle'):
+ with open(os.path.join(testsdir, p), 'r') as f:
filedata = f.read()
self.assertIsNotNone(pattern.search(filedata))
filedata = f.read()
self.assertIsNotNone(pattern.search(filedata))
- tp = os.path.join(testsdir,
- 'source-files/open-keychain/open-keychain/OpenKeychain/build.gradle')
- with open(tp, 'r') as f:
- filedata = f.read()
- self.assertIsNone(pattern.search(filedata))
if __name__ == "__main__":
parser = optparse.OptionParser()
if __name__ == "__main__":
parser = optparse.OptionParser()