commit 92cf32da1f3d84bf36a1b982c8cc281e5e8f3024 Author: Arturo Filastò art@fuffa.org Date: Thu Nov 8 17:01:47 2012 +0100
Move test inputs back to where they were. --- inputs/dns_tamper_file.txt | 3 --- inputs/dns_tamper_test_resolvers.txt | 2 -- inputs/http_host_file.txt | 2 -- inputs/keyword_filtering_file.txt | 2 -- inputs/url_lists_file.txt | 2 -- test_inputs/README | 2 ++ test_inputs/dns_tamper_file.txt | 3 +++ test_inputs/dns_tamper_test_resolvers.txt | 2 ++ test_inputs/http_host_file.txt | 2 ++ test_inputs/keyword_filtering_file.txt | 2 ++ test_inputs/url_lists_file.txt | 2 ++ 11 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/inputs/dns_tamper_file.txt b/inputs/dns_tamper_file.txt deleted file mode 100644 index 25f365c..0000000 --- a/inputs/dns_tamper_file.txt +++ /dev/null @@ -1,3 +0,0 @@ -torproject.org -google.com -measurementlab.net diff --git a/inputs/dns_tamper_test_resolvers.txt b/inputs/dns_tamper_test_resolvers.txt deleted file mode 100644 index 14c77e0..0000000 --- a/inputs/dns_tamper_test_resolvers.txt +++ /dev/null @@ -1,2 +0,0 @@ -8.8.8.8 -8.8.4.4 diff --git a/inputs/http_host_file.txt b/inputs/http_host_file.txt deleted file mode 100644 index 12afb18..0000000 --- a/inputs/http_host_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -torproject.org -ooni.nu diff --git a/inputs/keyword_filtering_file.txt b/inputs/keyword_filtering_file.txt deleted file mode 100644 index 4583bae..0000000 --- a/inputs/keyword_filtering_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -antani -sblinda diff --git a/inputs/url_lists_file.txt b/inputs/url_lists_file.txt deleted file mode 100644 index 16a4f58..0000000 --- a/inputs/url_lists_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -http://ooni.nu/test -http://torproject.org/ diff --git a/test_inputs/README b/test_inputs/README new file mode 100644 index 0000000..cbf0782 --- /dev/null +++ b/test_inputs/README @@ -0,0 +1,2 @@ +These inputs are here to assist the running of before_i_commit.sh that is used to verify proper functioning of ooniprobe. + diff --git a/test_inputs/dns_tamper_file.txt b/test_inputs/dns_tamper_file.txt new file mode 100644 index 0000000..25f365c --- /dev/null +++ b/test_inputs/dns_tamper_file.txt @@ -0,0 +1,3 @@ +torproject.org +google.com +measurementlab.net diff --git a/test_inputs/dns_tamper_test_resolvers.txt b/test_inputs/dns_tamper_test_resolvers.txt new file mode 100644 index 0000000..14c77e0 --- /dev/null +++ b/test_inputs/dns_tamper_test_resolvers.txt @@ -0,0 +1,2 @@ +8.8.8.8 +8.8.4.4 diff --git a/test_inputs/http_host_file.txt b/test_inputs/http_host_file.txt new file mode 100644 index 0000000..12afb18 --- /dev/null +++ b/test_inputs/http_host_file.txt @@ -0,0 +1,2 @@ +torproject.org +ooni.nu diff --git a/test_inputs/keyword_filtering_file.txt b/test_inputs/keyword_filtering_file.txt new file mode 100644 index 0000000..4583bae --- /dev/null +++ b/test_inputs/keyword_filtering_file.txt @@ -0,0 +1,2 @@ +antani +sblinda diff --git a/test_inputs/url_lists_file.txt b/test_inputs/url_lists_file.txt new file mode 100644 index 0000000..16a4f58 --- /dev/null +++ b/test_inputs/url_lists_file.txt @@ -0,0 +1,2 @@ +http://ooni.nu/test +http://torproject.org/