From 693ae2bedc1c43ca86cb3683e1472e505658cba2 Mon Sep 17 00:00:00 2001 From: Joakim Hamren Date: Mon, 10 Mar 2014 03:44:26 +0100 Subject: [PATCH] Updated setup.py and tests accordingly. --- setup.py | 6 +++++- tests/__init__.py | 0 tests/log_test.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tests/__init__.py diff --git a/setup.py b/setup.py index 2cc4027..2c96f62 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,9 @@ description="Linux system information web dashboard", long_description="psdash is a system information web dashboard for linux using data mainly served by psutil", classifiers=[ + "System :: Monitoring", + "System :: Logging", + "System :: Networking :: Monitoring", "Development Status :: 4 - Beta", "Operating System :: Linux", "Programming Language :: Python", @@ -20,13 +23,14 @@ author_email="joakim.hamren@gmail.com", url="https://github.com/Jahaja/psdash", license="CC0", - packages=find_packages(), + packages=find_packages(exclude=["tests"]), include_package_data=True, zip_safe=False, install_requires=[ "Flask==0.10.1", "psutil==1.2.1" ], + test_suite="tests", entry_points={ "console_scripts": [ "psdash = psdash.web:main" diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/log_test.py b/tests/log_test.py index 2f3a7c6..4241f39 100644 --- a/tests/log_test.py +++ b/tests/log_test.py @@ -27,13 +27,13 @@ def test_searching(self): log = self.logs.get(self.filename) log.searcher.reset() positions = [log.search(self.NEEDLE)[0] for _ in xrange(len(self.POSITIONS))] - self.assertListEqual(self.POSITIONS, positions) + self.assertEqual(self.POSITIONS, positions) def test_searching_other_buffer_size(self): log = LogReader(self.filename, LogReader.BUFFER_SIZE / 2) log.searcher.reset() positions = [log.search(self.NEEDLE)[0] for _ in xrange(len(self.POSITIONS))] - self.assertListEqual(self.POSITIONS, positions) + self.assertEqual(self.POSITIONS, positions) if __name__ == "__main__":