Commit graph

716 commits

Author SHA1 Message Date
vladdd
7d691011e5 Resolve conflicts from demo 2 updates 2013-09-23 13:38:18 -04:00
dachshund
d9e952ef5b Fix replay attack integration test.
Merge remote-tracking branch 'origin/demo2' into demo2

Conflicts:
	tests/integration/test_replay_attack.py
2013-09-17 23:02:17 -04:00
dachshund
b0e328be53 Fix replay attack integration test.
Merge remote-tracking branch 'origin/demo2' into demo2

Conflicts:
	tests/integration/test_replay_attack.py
2013-09-17 23:02:17 -04:00
dachshund
7eb834ab84 Fix replay attack integration test. 2013-09-17 22:59:26 -04:00
dachshund
4e42a091a2 Fix replay attack integration test. 2013-09-17 22:59:26 -04:00
vladdd
c2689280b0 Resolve merge conflicts 2013-09-17 21:10:51 -04:00
vladdd
b17b53112c Resolve merge conflicts 2013-09-17 21:10:51 -04:00
vladdd
ac2e7b5e15 Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2 2013-09-17 20:23:11 -04:00
vladdd
81831b861e Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2 2013-09-17 20:23:11 -04:00
vladdd
071190d18b Fix docstring indentation in test_arbitrary_package_attack.py 2013-09-17 20:20:55 -04:00
vladdd
98ae4a6d68 Fix docstring indentation in test_arbitrary_package_attack.py 2013-09-17 20:20:55 -04:00
dachshund
76326f82d1 Merge #108. 2013-09-17 20:02:54 -04:00
dachshund
91aff1c420 Merge #108. 2013-09-17 20:02:54 -04:00
dachshund
e210decd61 Merge branch 'demo2' of https://github.com/zhengyuyu/tuf into zhengyuyu-demo2 2013-09-17 19:38:26 -04:00
dachshund
61be096ad9 Merge branch 'demo2' of https://github.com/zhengyuyu/tuf into zhengyuyu-demo2 2013-09-17 19:38:26 -04:00
ttgump
017c9a378f fix of connection refused 2013-09-16 11:12:18 -04:00
ttgump
0f71b7604d fix of connection refused 2013-09-16 11:12:18 -04:00
ttgump
2baaa58a20 fetch upstream 2013-09-16 10:57:23 -04:00
ttgump
c393507fcd fetch upstream 2013-09-16 10:57:23 -04:00
vladimir-v-diaz
b9ec0a0b26 Update test_util_test_tools.py following change to util_test_tools.init_repo()
A util_test_tools.init_repo() parameter name was changed from 'tuf' to 'using_tuf', however, test_util_test_tools was not updated following the name change.
2013-09-16 09:09:40 -04:00
vladimir-v-diaz
cc0d7f9e89 Update test_util_test_tools.py following change to util_test_tools.init_repo()
A util_test_tools.init_repo() parameter name was changed from 'tuf' to 'using_tuf', however, test_util_test_tools was not updated following the name change.
2013-09-16 09:09:40 -04:00
zanefisher
f3a8f60583 Clean up after botched merge (oops). Add try/finally to endless data test to ensure temp files are always removed. 2013-09-14 16:58:01 -04:00
zanefisher
0fd5e36909 Clean up after botched merge (oops). Add try/finally to endless data test to ensure temp files are always removed. 2013-09-14 16:58:01 -04:00
ttgump
4c2f878870 util_test_tools.init_repo parameter fix 2013-09-14 15:46:25 -04:00
ttgump
c74a2d495f util_test_tools.init_repo parameter fix 2013-09-14 15:46:25 -04:00
ttgump
cd805e528d indention fix 2013-09-14 12:34:01 -07:00
ttgump
a688a6d06f indention fix 2013-09-14 12:34:01 -07:00
ttgump
dccd5fc7df Merge remote-tracking branch 'origin/demo2' into demo2 2013-09-14 12:31:15 -07:00
ttgump
2fc73dd468 Merge remote-tracking branch 'origin/demo2' into demo2 2013-09-14 12:31:15 -07:00
ttgump
3cf472757a test_mix_and_match_attack and test_indefinite_freeze_attack refactory fix 2013-09-13 19:14:32 -04:00
ttgump
384626cff9 test_mix_and_match_attack and test_indefinite_freeze_attack refactory fix 2013-09-13 19:14:32 -04:00
zanefisher
b991cdc21d Redo accidentally undone changes. 2013-09-13 18:52:47 -04:00
zanefisher
4a08c0c25e Redo accidentally undone changes. 2013-09-13 18:52:47 -04:00
zhengyuyu
f0258ea82c Fix test_delegations.py
Made changes that ensure it raises correct exception based on the refactored version of updater.py and download.py
2013-09-13 18:38:52 -04:00
zhengyuyu
ccbaa6fab4 Fix test_delegations.py
Made changes that ensure it raises correct exception based on the refactored version of updater.py and download.py
2013-09-13 18:38:52 -04:00
dachshund
edec089965 Fix variable shadow bug, use absolute import in two integration tests. 2013-09-13 17:39:57 -04:00
dachshund
b5263e4322 Fix variable shadow bug, use absolute import in two integration tests. 2013-09-13 17:39:57 -04:00
zanefisher
e059cf814b More integration test tidying-up 2013-09-13 17:39:29 -04:00
zanefisher
502a0102ec More integration test tidying-up 2013-09-13 17:39:29 -04:00
zanefisher
a397e208cd Rename boolean perameter 'TUF' to 'using_tuf' in every test. 2013-09-13 15:30:11 -04:00
zanefisher
f4eedf1d62 Rename boolean perameter 'TUF' to 'using_tuf' in every test. 2013-09-13 15:30:11 -04:00
zanefisher
8d8c223123 Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-13 13:39:44 -04:00
zanefisher
419b1dc24e Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-13 13:39:44 -04:00
zanefisher
f2517e1717 Clean up extraneous dependencies test following Vlad's review. 2013-09-13 13:38:50 -04:00
zanefisher
32427505ac Clean up extraneous dependencies test following Vlad's review. 2013-09-13 13:38:50 -04:00
vladdd
83ac535d32 Fix test_updater.py test case failure
Rebuild server repository in test_5_all_targets() - other test cases may not have properly restored the contents of the repository.
2013-09-13 09:54:10 -04:00
vladdd
d8841544e4 Fix test_updater.py test case failure
Rebuild server repository in test_5_all_targets() - other test cases may not have properly restored the contents of the repository.
2013-09-13 09:54:10 -04:00
zanefisher
d75e47f2cd Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-12 14:54:25 -04:00
zanefisher
4f8054755c Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-12 14:54:25 -04:00
zanefisher
a3fbb50b2a Update extraneous dependecies test to expect the new NoWorkingMirrorError. 2013-09-12 14:53:57 -04:00
zanefisher
a5692a1441 Update extraneous dependecies test to expect the new NoWorkingMirrorError. 2013-09-12 14:53:57 -04:00
vladdd
b89d6fb853 Update test_keystore.py following .key format and keystore changes 2013-09-12 13:02:54 -04:00
vladdd
dc146f97a1 Fix test_util_test_tools.py test case failure
Clear the keystore before initializing the util_test_tools.py repository and again after every test case exits.
2013-09-12 08:14:18 -04:00
vladdd
3111c22c63 Fix test_util_test_tools.py test case failure
Clear the keystore before initializing the util_test_tools.py repository and again after every test case exits.
2013-09-12 08:14:18 -04:00
vladdd
a1132af5af Fix test_keystore.py unit test failure
Ensure the keystore is empty prior to running the test cases.  The courtesy bug is spreading.
2013-09-11 13:33:28 -04:00
vladdd
a749c1d6bf Fix test_keystore.py unit test failure
Ensure the keystore is empty prior to running the test cases.  The courtesy bug is spreading.
2013-09-11 13:33:28 -04:00
vladdd
7e98cb8269 Fix unit test failure in test_roledb.py
Ensure roledb is empty prior to running the test cases.  roledb.py may have been modified by other unit tests that did not properly clean up.
2013-09-11 12:36:44 -04:00
vladdd
b7d86eca36 Fix unit test failure in test_roledb.py
Ensure roledb is empty prior to running the test cases.  roledb.py may have been modified by other unit tests that did not properly clean up.
2013-09-11 12:36:44 -04:00
dachshund
59dfa1f5ba Replace relative with absolute imports for tests. 2013-09-10 17:33:00 -04:00
dachshund
96c0aaaa9e Replace relative with absolute imports for tests. 2013-09-10 17:33:00 -04:00
dachshund
864d3065a8 Merge unit test fix from @zanefisher; fix a unit test bug. 2013-09-10 00:56:30 -04:00
dachshund
9cbffa1660 Merge unit test fix from @zanefisher; fix a unit test bug. 2013-09-10 00:56:30 -04:00
dachshund
9bd35596c9 Merge branch 'demo2' of https://github.com/zanefisher/tuf into demo2
Conflicts:
	tests/unit/test_updater.py
2013-09-10 00:39:49 -04:00
dachshund
a8d32a2220 Merge branch 'demo2' of https://github.com/zanefisher/tuf into demo2
Conflicts:
	tests/unit/test_updater.py
2013-09-10 00:39:49 -04:00
dachshund
78344636de Even better organization of tests; remove evpy.
Require higher versions of PyCrypto.
2013-09-10 00:24:34 -04:00
dachshund
c20f0a1455 Even better organization of tests; remove evpy.
Require higher versions of PyCrypto.
2013-09-10 00:24:34 -04:00