From a195fdca57a2d31942abe99500510b8f31437401 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 1 May 2019 16:07:58 -0700 Subject: [PATCH] diaspora: Convert tests to pytest style Signed-off-by: Sunil Mohan Adapa Reviewed-by: Joseph Nuthalapati --- .../diaspora/tests/test_apache_config.py | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/plinth/modules/diaspora/tests/test_apache_config.py b/plinth/modules/diaspora/tests/test_apache_config.py index e39f39dad..a1c5c1ad1 100644 --- a/plinth/modules/diaspora/tests/test_apache_config.py +++ b/plinth/modules/diaspora/tests/test_apache_config.py @@ -20,25 +20,21 @@ Test Apache configuration generation for diaspora* import os import tempfile -import unittest from plinth.modules import diaspora -class TestDiaspora(unittest.TestCase): - """Test Apache configuration for Diaspora module.""" +def test_generate_apache_configuration(): + """Test that Apache configuration is created properly.""" + with tempfile.NamedTemporaryFile() as conf_file: + diaspora.generate_apache_configuration(conf_file.name, + 'freedombox.rocks') - def test_generate_apache_configuration(self): - """Test that Apache configuration is created properly.""" - with tempfile.NamedTemporaryFile() as conf_file: - diaspora.generate_apache_configuration(conf_file.name, - 'freedombox.rocks') + assert os.stat(conf_file.name).st_size != 0 - assert os.stat(conf_file.name).st_size != 0 + with open(conf_file.name) as file_handle: + contents = file_handle.read() - with open(conf_file.name) as file_handle: - contents = file_handle.read() - - assert all( - word in contents - for word in ['VirtualHost', 'Location', 'Directory', 'assets']) + assert all( + word in contents + for word in ['VirtualHost', 'Location', 'Directory', 'assets'])