Skip to content

Fix filesystem sensor for directories #21729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Mar 1, 2022
Merged

Fix filesystem sensor for directories #21729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion airflow/sensors/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def poke(self, context: Context):
self.log.info('Found File %s last modified: %s', str(path), mod_time)
return True

for _, _, files in os.walk(full_path):
for _, _, files in os.walk(path):
if len(files) > 0:
return True
return False
36 changes: 34 additions & 2 deletions tests/sensors/test_filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#

import os.path
import os
import shutil
import tempfile
import unittest
Expand Down Expand Up @@ -131,6 +131,38 @@ def test_wildcard_file(self):
task._hook = self.hook
task.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)

def test_wildcard_empty_directory(self):
with tempfile.TemporaryDirectory() as temp_dir:
with tempfile.TemporaryDirectory(suffix='subdir', dir=temp_dir):
task = FileSensor(
task_id='test',
filepath=os.path.join(temp_dir, '*dir'),
fs_conn_id='fs_default',
dag=self.dag,
timeout=0,
)
task._hook = self.hook

# No files in dir
with pytest.raises(AirflowSensorTimeout):
task.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)

def test_wildcard_directory_with_files(self):
with tempfile.TemporaryDirectory() as temp_dir:
with tempfile.TemporaryDirectory(suffix='subdir', dir=temp_dir) as subdir:
task = FileSensor(
task_id='test',
filepath=os.path.join(temp_dir, '*dir'),
fs_conn_id='fs_default',
dag=self.dag,
timeout=0,
)
task._hook = self.hook

# `touch` the file in subdir
open(os.path.join(subdir, 'file'), 'a').close()
task.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)

def test_wildcared_directory(self):
temp_dir = tempfile.mkdtemp()
subdir = tempfile.mkdtemp(dir=temp_dir)
Expand All @@ -146,7 +178,7 @@ def test_wildcared_directory(self):
task._hook = self.hook

try:
# `touch` the dir
# `touch` the file in subdir
open(subdir + "/file", "a").close()
task.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)
finally:
Expand Down