[tor-commits] [ooni-probe/master] Delete inputs, resources and decks data directories

art at torproject.org art at torproject.org
Mon Sep 19 12:14:23 UTC 2016


commit 9b48ff3033e93e7386a70f8649657e70abe061cf
Author: Arturo Filastò <arturo at filasto.net>
Date:   Tue Jul 26 16:14:51 2016 +0200

    Delete inputs, resources and decks data directories
---
 MANIFEST.in                      |  2 --
 data/decks/complete.deck         | 72 ----------------------------------------
 data/decks/complete_no_root.deck | 60 ---------------------------------
 data/decks/fast.deck             | 36 --------------------
 data/decks/fast_no_root.deck     | 24 --------------
 data/decks/mlab.deck             | 12 -------
 data/inputs/.gitignore           |  2 --
 data/resources/README            |  2 --
 8 files changed, 210 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index e2903fb..692c73f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,4 @@
 include README.rst ChangeLog.rst requirements.txt LICENSE
-recursive-include data/decks *
-recursive-include data/inputs *
 include data/oonideckgen.1
 include data/ooniprobe.1
 include data/oonireport.1
diff --git a/data/decks/complete.deck b/data/decks/complete.deck
deleted file mode 100644
index 7d9346c..0000000
--- a/data/decks/complete.deck
+++ /dev/null
@@ -1,72 +0,0 @@
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1']
-    test_file: blocking/http_requests
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1']
-    test_file: blocking/dns_consistency
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_invalid_request_line
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_header_field_manipulation
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/traceroute
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1']
-    test_file: manipulation/http_host
-    testdeck: null
diff --git a/data/decks/complete_no_root.deck b/data/decks/complete_no_root.deck
deleted file mode 100644
index ba2c29b..0000000
--- a/data/decks/complete_no_root.deck
+++ /dev/null
@@ -1,60 +0,0 @@
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1']
-    test_file: blocking/http_requests
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1']
-    test_file: blocking/dns_consistency
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_invalid_request_line
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_header_field_manipulation
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: [-f, 'httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1']
-    test_file: manipulation/http_host
-    testdeck: null
diff --git a/data/decks/fast.deck b/data/decks/fast.deck
deleted file mode 100644
index ddf3c71..0000000
--- a/data/decks/fast.deck
+++ /dev/null
@@ -1,36 +0,0 @@
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/traceroute
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_invalid_request_line
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_header_field_manipulation
-    testdeck: null
diff --git a/data/decks/fast_no_root.deck b/data/decks/fast_no_root.deck
deleted file mode 100644
index 69bdf2f..0000000
--- a/data/decks/fast_no_root.deck
+++ /dev/null
@@ -1,24 +0,0 @@
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_invalid_request_line
-    testdeck: null
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_header_field_manipulation
-    testdeck: null
diff --git a/data/decks/mlab.deck b/data/decks/mlab.deck
deleted file mode 100644
index 59dc458..0000000
--- a/data/decks/mlab.deck
+++ /dev/null
@@ -1,12 +0,0 @@
-- options:
-    collector: null
-    help: 0
-    logfile: null
-    no-default-reporter: 0
-    parallelism: null
-    pcapfile: null
-    reportfile: null
-    resume: 0
-    subargs: []
-    test_file: manipulation/http_header_field_manipulation
-    testdeck: null
diff --git a/data/inputs/.gitignore b/data/inputs/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/data/inputs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/data/resources/README b/data/resources/README
deleted file mode 100644
index fb768f4..0000000
--- a/data/resources/README
+++ /dev/null
@@ -1,2 +0,0 @@
-In here shall be stored all the resources downloaded via ooniresources to be
-used by oonideckgen.





More information about the tor-commits mailing list