[Notes] [Git][BuildStream/buildstream][tristan/fix-double-terminate-prom

Tristan Van Berkom pushed to branch tristan/fix-double-terminate-prompt at BuildStream / buildstream

Commits:

3bf895d2

by Jonathan Maw at 2018-10-03T11:48:48Z

tests: Add regression test for mirroring with project.refs

e4969807

by Jonathan Maw at 2018-10-03T12:48:07Z

Merge branch 'jonathan/source-mirror-project-refs' into 'master'

tests: Add regression test for mirroring with project.refs

See merge request BuildStream/buildstream!823

a0814399

by Tristan Van Berkom at 2018-10-03T13:05:52Z

_scheduler/scheduler.py: Ignore interrupt events while terminating.

For some reason, we now receive a SIGINT from the main loop even
when the SIGINT occurred with the handler disconnected in an interactive
prompt. This patch simply ignores any received SIGINT events from the
main loop in the case that we are already in the process of terminating.

This fixes issue #693

Changes:

buildstream/_scheduler/scheduler.py

@@ -387,6 +387,15 @@ class Scheduler():
      # A loop registered event callback for keyboard interrupts
+     #
      def _interrupt_event(self):
++
 +        # FIXME: This should not be needed, but for some reason we receive an
 +        #        additional SIGINT event when the user hits ^C a second time
 +        #        to inform us that they really intend to terminate; even though
 +        #        we have disconnected our handlers at this time.
 +        #
 +        if self.terminated:
 +            return
++
          # Leave this to the frontend to decide, if no
          # interrrupt callback was specified, then just terminate.
          if self._interrupt_callback:

tests/frontend/mirror.py

@@ -139,6 +139,82 @@ def test_mirror_fetch(cli, tmpdir, datafiles, kind):
      result.assert_success()
 +@pytest.mark.datafiles(DATA_DIR)
 +@pytest.mark.parametrize("ref_storage", [("inline"), ("project.refs")])
 +@pytest.mark.parametrize("mirror", [("no-mirror"), ("mirror"), ("unrelated-mirror")])
 +def test_mirror_fetch_ref_storage(cli, tmpdir, datafiles, ref_storage, mirror):
 +    bin_files_path = os.path.join(str(datafiles), 'files', 'bin-files', 'usr')
 +    dev_files_path = os.path.join(str(datafiles), 'files', 'dev-files', 'usr')
 +    upstream_repodir = os.path.join(str(tmpdir), 'upstream')
 +    mirror_repodir = os.path.join(str(tmpdir), 'mirror')
 +    project_dir = os.path.join(str(tmpdir), 'project')
 +    os.makedirs(project_dir)
 +    element_dir = os.path.join(project_dir, 'elements')
++
 +    # Create repo objects of the upstream and mirror
 +    upstream_repo = create_repo('tar', upstream_repodir)
 +    upstream_ref = upstream_repo.create(bin_files_path)
 +    mirror_repo = upstream_repo.copy(mirror_repodir)
 +    mirror_ref = upstream_ref
 +    upstream_ref = upstream_repo.create(dev_files_path)
++
 +    element = {
 +        'kind': 'import',
 +        'sources': [
 +            upstream_repo.source_config(ref=upstream_ref if ref_storage == 'inline' else None)
 +        ]
 +    }
 +    element_name = 'test.bst'
 +    element_path = os.path.join(element_dir, element_name)
 +    full_repo = element['sources'][0]['url']
 +    upstream_map, repo_name = os.path.split(full_repo)
 +    alias = 'foo'
 +    aliased_repo = alias + ':' + repo_name
 +    element['sources'][0]['url'] = aliased_repo
 +    full_mirror = mirror_repo.source_config()['url']
 +    mirror_map, _ = os.path.split(full_mirror)
 +    os.makedirs(element_dir)
 +    _yaml.dump(element, element_path)
++
 +    if ref_storage == 'project.refs':
 +        # Manually set project.refs to avoid caching the repo prematurely
 +        project_refs = {'projects': {
 +            'test': {
 +                element_name: [
 +                    {'ref': upstream_ref}
 +                ]
 +            }
 +        }}
 +        project_refs_path = os.path.join(project_dir, 'project.refs')
 +        _yaml.dump(project_refs, project_refs_path)
++
 +    project = {
 +        'name': 'test',
 +        'element-path': 'elements',
 +        'aliases': {
 +            alias: upstream_map + "/"
 +        },
 +        'ref-storage': ref_storage
 +    }
 +    if mirror != 'no-mirror':
 +        mirror_data = [{
 +            'name': 'middle-earth',
 +            'aliases': {alias: [mirror_map + '/']}
 +        }]
 +        if mirror == 'unrelated-mirror':
 +            mirror_data.insert(0, {
 +                'name': 'narnia',
 +                'aliases': {'frob': ['http://www.example.com/repo']}
 +            })
 +        project['mirrors'] = mirror_data
++
 +    project_file = os.path.join(project_dir, 'project.conf')
 +    _yaml.dump(project, project_file)
++
 +    result = cli.run(project=project_dir, args=['fetch', element_name])
 +    result.assert_success()
++
++
  @pytest.mark.datafiles(DATA_DIR)
  @pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS])
  def test_mirror_fetch_upstream_absent(cli, tmpdir, datafiles, kind):

[Notes] [Git][BuildStream/buildstream][tristan/fix-double-terminate-prompt] 3 commits: tests: Add regression test for mirroring with project.refs

Tristan Van Berkom pushed to branch tristan/fix-double-terminate-prompt at BuildStream / buildstream

Commits:

2 changed files:

Changes: