You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by ms...@apache.org on 2017/06/22 16:16:20 UTC
[3/6] incubator-senssoft-distill git commit: #SENSSOFT-193: Cleaning
up directory structure including tests
#SENSSOFT-193: Cleaning up directory structure including tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/81f24142
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/81f24142
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/81f24142
Branch: refs/heads/elk5.4-upgrade
Commit: 81f24142afdeca6320531aec7ee1e8728a96f8d8
Parents: 713c740
Author: msbeard <ms...@apache.org>
Authored: Thu Jun 22 11:31:24 2017 -0400
Committer: msbeard <ms...@apache.org>
Committed: Thu Jun 22 11:31:24 2017 -0400
----------------------------------------------------------------------
distill/config.cfg | 57 ------------------------------------------
distill/config/config.cfg | 57 ++++++++++++++++++++++++++++++++++++++++++
tests/__init__.py | 21 ----------------
tests/basic_test.py | 25 ------------------
tests/distill_test.py | 41 ------------------------------
tests/test_app.py | 25 ++++++++++++++++++
tests/test_userale.py | 41 ++++++++++++++++++++++++++++++
7 files changed, 123 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/distill/config.cfg
----------------------------------------------------------------------
diff --git a/distill/config.cfg b/distill/config.cfg
deleted file mode 100644
index 189e3ea..0000000
--- a/distill/config.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Statement for enabling the development environment
-DEBUG = True
-
-# Host
-HOST = '0.0.0.0'
-
-# Port
-PORT = 8090
-
-# Enable STOUT integration into Distill
-ENABLE_STOUT = False
-SQLITEDB = '../path/to/stout/stout.db'
-MASTER = '../path/to/master/master_ans.csv'
-MAPPINGS = '../path/to/mappings/MOT_Mappings.csv'
-SELECTED = '../path/to/stout/selected_vars_for_distill.csv'
-
-# Elasticsearch Configuration
-ES_HOST = 'http://elasticsearch'
-ES_PORT = 9200
-HTTP_AUTH = None
-USE_SSL = False
-VERIFY_CERTS = False
-CA_CERTS = None
-CLIENT_CERT = None
-CLIENT_KEY = None
-TIMEOUT = 3
-
-# Application threads. A common general assumption is
-# using 2 per available processor cores - to handle
-# incoming requests using one and performing background
-# operations using the other.
-THREADS_PER_PAGE = 2
-
-# Enable protection agains *Cross-site Request Forgery (CSRF)*
-# CSRF_ENABLED = True
-
-# Use a secure, unique and absolutely secret key for
-# signing the data.
-# CSRF_SESSION_KEY = "secret"
-
-# Secret key for signing cookies
-# SECRET_KEY = "secret"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/distill/config/config.cfg
----------------------------------------------------------------------
diff --git a/distill/config/config.cfg b/distill/config/config.cfg
new file mode 100644
index 0000000..189e3ea
--- /dev/null
+++ b/distill/config/config.cfg
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Statement for enabling the development environment
+DEBUG = True
+
+# Host
+HOST = '0.0.0.0'
+
+# Port
+PORT = 8090
+
+# Enable STOUT integration into Distill
+ENABLE_STOUT = False
+SQLITEDB = '../path/to/stout/stout.db'
+MASTER = '../path/to/master/master_ans.csv'
+MAPPINGS = '../path/to/mappings/MOT_Mappings.csv'
+SELECTED = '../path/to/stout/selected_vars_for_distill.csv'
+
+# Elasticsearch Configuration
+ES_HOST = 'http://elasticsearch'
+ES_PORT = 9200
+HTTP_AUTH = None
+USE_SSL = False
+VERIFY_CERTS = False
+CA_CERTS = None
+CLIENT_CERT = None
+CLIENT_KEY = None
+TIMEOUT = 3
+
+# Application threads. A common general assumption is
+# using 2 per available processor cores - to handle
+# incoming requests using one and performing background
+# operations using the other.
+THREADS_PER_PAGE = 2
+
+# Enable protection agains *Cross-site Request Forgery (CSRF)*
+# CSRF_ENABLED = True
+
+# Use a secure, unique and absolutely secret key for
+# signing the data.
+# CSRF_SESSION_KEY = "secret"
+
+# Secret key for signing cookies
+# SECRET_KEY = "secret"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/__init__.py
----------------------------------------------------------------------
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index 09c5e2f..0000000
--- a/tests/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: tests module.
-
-Meant for use with py.test.
-Organize tests into files, each named xxx_test.py
-Read more here: http://pytest.org/
-'''
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/basic_test.py
----------------------------------------------------------------------
diff --git a/tests/basic_test.py b/tests/basic_test.py
deleted file mode 100644
index 3f44294..0000000
--- a/tests/basic_test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-distill: Test module.
-
-Meant for use with py.test.
-Write each test as a function named test_<something>.
-Read more here: http://pytest.org/
-'''
-
-
-def test_example():
- assert True
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/distill_test.py
----------------------------------------------------------------------
diff --git a/tests/distill_test.py b/tests/distill_test.py
deleted file mode 100644
index dc64027..0000000
--- a/tests/distill_test.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def test_example():
- assert True
- # with test_app.test_client () as c:
- # rv = c.get ('/?tequila=42')
- # assert request.args ['tequila'] == '42'
-
-# import os
-# import flaskr
-# import unittest
-# import tempfile
-
-# class FlaskrTestCase(unittest.TestCase):
-
-# def setUp(self):
-# self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
-# flaskr.app.config['TESTING'] = True
-# self.app = flaskr.app.test_client()
-# flaskr.init_db()
-
-# def tearDown(self):
-# os.close(self.db_fd)
-# os.unlink(flaskr.app.config['DATABASE'])
-
-# if __name__ == '__main__':
-# unittest.main()
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/test_app.py
----------------------------------------------------------------------
diff --git a/tests/test_app.py b/tests/test_app.py
new file mode 100644
index 0000000..3f44294
--- /dev/null
+++ b/tests/test_app.py
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+'''
+distill: Test module.
+
+Meant for use with py.test.
+Write each test as a function named test_<something>.
+Read more here: http://pytest.org/
+'''
+
+
+def test_example():
+ assert True
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/81f24142/tests/test_userale.py
----------------------------------------------------------------------
diff --git a/tests/test_userale.py b/tests/test_userale.py
new file mode 100644
index 0000000..dc64027
--- /dev/null
+++ b/tests/test_userale.py
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+def test_example():
+ assert True
+ # with test_app.test_client () as c:
+ # rv = c.get ('/?tequila=42')
+ # assert request.args ['tequila'] == '42'
+
+# import os
+# import flaskr
+# import unittest
+# import tempfile
+
+# class FlaskrTestCase(unittest.TestCase):
+
+# def setUp(self):
+# self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
+# flaskr.app.config['TESTING'] = True
+# self.app = flaskr.app.test_client()
+# flaskr.init_db()
+
+# def tearDown(self):
+# os.close(self.db_fd)
+# os.unlink(flaskr.app.config['DATABASE'])
+
+# if __name__ == '__main__':
+# unittest.main()