From 4db6393f9b4291356c46078fdcfa9388d4377880 Mon Sep 17 00:00:00 2001
From: Benjamin Dweck <bjdweck@gmail.com>
Date: Thu, 15 Oct 2020 23:35:49 +0200
Subject: [PATCH] Reorganized project structure vis a vis tests

---
 .gitignore                                                    | 2 +-
 {torch_sub/test => test}/__init__.py                          | 0
 {torch_sub/test => test}/agent-config/ca.crt                  | 0
 {torch_sub/test => test}/agent-config/torch.conf              | 0
 {torch_sub/test => test}/agent-config/vagrant.crt             | 0
 {torch_sub/test => test}/agent-config/vagrant.key             | 0
 {torch_sub/test => test}/broker-config/ca.crt                 | 0
 {torch_sub/test => test}/broker-config/mosquitto.conf         | 0
 {torch_sub/test => test}/broker-config/mqtt.example.com.crt   | 0
 {torch_sub/test => test}/broker-config/mqtt.example.com.key   | 0
 {torch_sub/test => test}/pki/ca.crt                           | 0
 {torch_sub/test => test}/pki/ca.key                           | 0
 {torch_sub/test => test}/pki/ca.srl                           | 0
 {torch_sub/test => test}/pki/mqtt.example.com.crt             | 0
 {torch_sub/test => test}/pki/mqtt.example.com.key             | 0
 {torch_sub/test => test}/pki/subscriber.crt                   | 0
 {torch_sub/test => test}/pki/subscriber.key                   | 0
 {torch_sub/test => test}/pki/vagrant.crt                      | 0
 {torch_sub/test => test}/pki/vagrant.key                      | 0
 {torch_sub/test => test}/run-broker.bat                       | 0
 {torch_sub/test => test}/run-broker.sh                        | 0
 {torch_sub/test => test}/subscriber-config/ca.crt             | 0
 {torch_sub/test => test}/subscriber-config/subscriber.crt     | 0
 {torch_sub/test => test}/subscriber-config/subscriber.key     | 0
 .../test_integration_pub_sub.py                               | 4 ++--
 25 files changed, 3 insertions(+), 3 deletions(-)
 rename {torch_sub/test => test}/__init__.py (100%)
 rename {torch_sub/test => test}/agent-config/ca.crt (100%)
 rename {torch_sub/test => test}/agent-config/torch.conf (100%)
 rename {torch_sub/test => test}/agent-config/vagrant.crt (100%)
 rename {torch_sub/test => test}/agent-config/vagrant.key (100%)
 rename {torch_sub/test => test}/broker-config/ca.crt (100%)
 rename {torch_sub/test => test}/broker-config/mosquitto.conf (100%)
 rename {torch_sub/test => test}/broker-config/mqtt.example.com.crt (100%)
 rename {torch_sub/test => test}/broker-config/mqtt.example.com.key (100%)
 rename {torch_sub/test => test}/pki/ca.crt (100%)
 rename {torch_sub/test => test}/pki/ca.key (100%)
 rename {torch_sub/test => test}/pki/ca.srl (100%)
 rename {torch_sub/test => test}/pki/mqtt.example.com.crt (100%)
 rename {torch_sub/test => test}/pki/mqtt.example.com.key (100%)
 rename {torch_sub/test => test}/pki/subscriber.crt (100%)
 rename {torch_sub/test => test}/pki/subscriber.key (100%)
 rename {torch_sub/test => test}/pki/vagrant.crt (100%)
 rename {torch_sub/test => test}/pki/vagrant.key (100%)
 rename {torch_sub/test => test}/run-broker.bat (100%)
 rename {torch_sub/test => test}/run-broker.sh (100%)
 rename {torch_sub/test => test}/subscriber-config/ca.crt (100%)
 rename {torch_sub/test => test}/subscriber-config/subscriber.crt (100%)
 rename {torch_sub/test => test}/subscriber-config/subscriber.key (100%)
 rename torch_sub/test/integration_pub_sub.py => test/test_integration_pub_sub.py (96%)

diff --git a/.gitignore b/.gitignore
index b39cc1b..3f98fa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 venv
 .idea
-/torch_sub/test/clients.json
\ No newline at end of file
+/test/clients.json
\ No newline at end of file
diff --git a/torch_sub/test/__init__.py b/test/__init__.py
similarity index 100%
rename from torch_sub/test/__init__.py
rename to test/__init__.py
diff --git a/torch_sub/test/agent-config/ca.crt b/test/agent-config/ca.crt
similarity index 100%
rename from torch_sub/test/agent-config/ca.crt
rename to test/agent-config/ca.crt
diff --git a/torch_sub/test/agent-config/torch.conf b/test/agent-config/torch.conf
similarity index 100%
rename from torch_sub/test/agent-config/torch.conf
rename to test/agent-config/torch.conf
diff --git a/torch_sub/test/agent-config/vagrant.crt b/test/agent-config/vagrant.crt
similarity index 100%
rename from torch_sub/test/agent-config/vagrant.crt
rename to test/agent-config/vagrant.crt
diff --git a/torch_sub/test/agent-config/vagrant.key b/test/agent-config/vagrant.key
similarity index 100%
rename from torch_sub/test/agent-config/vagrant.key
rename to test/agent-config/vagrant.key
diff --git a/torch_sub/test/broker-config/ca.crt b/test/broker-config/ca.crt
similarity index 100%
rename from torch_sub/test/broker-config/ca.crt
rename to test/broker-config/ca.crt
diff --git a/torch_sub/test/broker-config/mosquitto.conf b/test/broker-config/mosquitto.conf
similarity index 100%
rename from torch_sub/test/broker-config/mosquitto.conf
rename to test/broker-config/mosquitto.conf
diff --git a/torch_sub/test/broker-config/mqtt.example.com.crt b/test/broker-config/mqtt.example.com.crt
similarity index 100%
rename from torch_sub/test/broker-config/mqtt.example.com.crt
rename to test/broker-config/mqtt.example.com.crt
diff --git a/torch_sub/test/broker-config/mqtt.example.com.key b/test/broker-config/mqtt.example.com.key
similarity index 100%
rename from torch_sub/test/broker-config/mqtt.example.com.key
rename to test/broker-config/mqtt.example.com.key
diff --git a/torch_sub/test/pki/ca.crt b/test/pki/ca.crt
similarity index 100%
rename from torch_sub/test/pki/ca.crt
rename to test/pki/ca.crt
diff --git a/torch_sub/test/pki/ca.key b/test/pki/ca.key
similarity index 100%
rename from torch_sub/test/pki/ca.key
rename to test/pki/ca.key
diff --git a/torch_sub/test/pki/ca.srl b/test/pki/ca.srl
similarity index 100%
rename from torch_sub/test/pki/ca.srl
rename to test/pki/ca.srl
diff --git a/torch_sub/test/pki/mqtt.example.com.crt b/test/pki/mqtt.example.com.crt
similarity index 100%
rename from torch_sub/test/pki/mqtt.example.com.crt
rename to test/pki/mqtt.example.com.crt
diff --git a/torch_sub/test/pki/mqtt.example.com.key b/test/pki/mqtt.example.com.key
similarity index 100%
rename from torch_sub/test/pki/mqtt.example.com.key
rename to test/pki/mqtt.example.com.key
diff --git a/torch_sub/test/pki/subscriber.crt b/test/pki/subscriber.crt
similarity index 100%
rename from torch_sub/test/pki/subscriber.crt
rename to test/pki/subscriber.crt
diff --git a/torch_sub/test/pki/subscriber.key b/test/pki/subscriber.key
similarity index 100%
rename from torch_sub/test/pki/subscriber.key
rename to test/pki/subscriber.key
diff --git a/torch_sub/test/pki/vagrant.crt b/test/pki/vagrant.crt
similarity index 100%
rename from torch_sub/test/pki/vagrant.crt
rename to test/pki/vagrant.crt
diff --git a/torch_sub/test/pki/vagrant.key b/test/pki/vagrant.key
similarity index 100%
rename from torch_sub/test/pki/vagrant.key
rename to test/pki/vagrant.key
diff --git a/torch_sub/test/run-broker.bat b/test/run-broker.bat
similarity index 100%
rename from torch_sub/test/run-broker.bat
rename to test/run-broker.bat
diff --git a/torch_sub/test/run-broker.sh b/test/run-broker.sh
similarity index 100%
rename from torch_sub/test/run-broker.sh
rename to test/run-broker.sh
diff --git a/torch_sub/test/subscriber-config/ca.crt b/test/subscriber-config/ca.crt
similarity index 100%
rename from torch_sub/test/subscriber-config/ca.crt
rename to test/subscriber-config/ca.crt
diff --git a/torch_sub/test/subscriber-config/subscriber.crt b/test/subscriber-config/subscriber.crt
similarity index 100%
rename from torch_sub/test/subscriber-config/subscriber.crt
rename to test/subscriber-config/subscriber.crt
diff --git a/torch_sub/test/subscriber-config/subscriber.key b/test/subscriber-config/subscriber.key
similarity index 100%
rename from torch_sub/test/subscriber-config/subscriber.key
rename to test/subscriber-config/subscriber.key
diff --git a/torch_sub/test/integration_pub_sub.py b/test/test_integration_pub_sub.py
similarity index 96%
rename from torch_sub/test/integration_pub_sub.py
rename to test/test_integration_pub_sub.py
index 718a80f..064e54e 100644
--- a/torch_sub/test/integration_pub_sub.py
+++ b/test/test_integration_pub_sub.py
@@ -12,12 +12,12 @@ from torch_sub import torch_sub
 
 broker_hostname = "mqtt.example.com"
 broker_port = 8883
-agent_config_path = "agent-config/"
+agent_config_path = "test/agent-config/"
 mqtt_ca_file = agent_config_path + "ca.crt"
 mqtt_cert_file = agent_config_path + "vagrant.crt"
 mqtt_key_file = agent_config_path + "vagrant.key"
 
-subscriber_config_path = "subscriber-config/"
+subscriber_config_path = "test/subscriber-config/"
 subscriber_ca_file = subscriber_config_path + "ca.crt"
 subscriber_cert_file = subscriber_config_path + "subscriber.crt"
 subscriber_key_file = subscriber_config_path + "subscriber.key"