Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions succulent/processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,9 @@ def data(self, req):
self.df = pd.read_xml(path)
else:
raise ValueError(f'Invalid file type: {self.format}')
else:
# No stored data (e.g. file removed): do not reuse stale data
self.df = pd.DataFrame()

# Check if data is available
if self.df.empty:
Expand Down Expand Up @@ -390,6 +393,9 @@ def export(self, req):
self.df = pd.read_xml(path)
else:
raise ValueError(f'Invalid file type: {self.format}')
else:
# No stored data (e.g. file removed): do not reuse stale data
self.df = pd.DataFrame()

# Check if data is available
if self.df.empty:
Expand Down
25 changes: 25 additions & 0 deletions tests/test_succulent.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,31 @@ def test_data_and_export(self):
['temperature,humidity', '21.5,40', '22.0,45'])


class TestStaleData(unittest.TestCase):
"""
Test that /data and /export do not return stale in-memory data.
"""

def setUp(self):
config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'password.yml')
self.api = SucculentAPI(host='0.0.0.0', port=8080, config=config_path, format='csv')
self.client = self.api.app.test_client()
self.headers = {'X-API-Key': 's3cret'}

def test_removed_data_file_is_not_served(self):
self.client.post('/measure', json={'temperature': 20}, headers=self.headers)
self.assertEqual(self.client.get('/data', headers=self.headers).status_code, 200)

# Remove the stored data while the server keeps running
os.remove(os.path.join(self.api.processing.directory, 'data.csv'))

for endpoint in ['/data', '/export']:
with self.subTest(endpoint=endpoint):
response = self.client.get(endpoint, headers=self.headers)
self.assertEqual(response.status_code, 400)
self.assertEqual(response.json['message'], 'No data available.')


class TestConfiguration(unittest.TestCase):
"""
Test case for the Configuration class.
Expand Down
Loading