From 4fdc36b9d05bff06d8d7abfc6f718ff73f3fcff8 Mon Sep 17 00:00:00 2001 From: Durham Goode Date: Tue, 12 Oct 2021 17:12:24 -0700 Subject: [PATCH] tests: remove test-empty-group-t.py Summary: We don't actually use bundle2 to deliver manifests anymore. Everything is done via ondemand fetching, which won't have the problem covered in this test. So let's delete it. Reviewed By: quark-zju Differential Revision: D31309313 fbshipit-source-id: 312508fa1b5e903314b92c048d23525c2194ab91 --- eden/scm/tests/test-empty-group-t.py | 117 --------------------------- 1 file changed, 117 deletions(-) delete mode 100644 eden/scm/tests/test-empty-group-t.py diff --git a/eden/scm/tests/test-empty-group-t.py b/eden/scm/tests/test-empty-group-t.py deleted file mode 100644 index e64bbfaf00..0000000000 --- a/eden/scm/tests/test-empty-group-t.py +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# Copyright (c) Mercurial Contributors. -# -# This software may be used and distributed according to the terms of the -# GNU General Public License version 2 or any later version. - -from __future__ import absolute_import - -from testutil.dott import feature, sh, testtmp # noqa: F401 - - -# A B -# -# 3 4 3 -# |\/| |\ -# |/\| | \ -# 1 2 1 2 -# \ / \ / -# 0 0 -# -# if the result of the merge of 1 and 2 -# is the same in 3 and 4, no new manifest -# will be created and the manifest group -# will be empty during the pull -# -# (plus we test a failure where outgoing -# wrongly reported the number of csets) - -sh % "setconfig experimental.allowfilepeer=True" -sh % "hg init a" -sh % "cd a" -sh % "touch init" -sh % "hg ci -A -m 0" == "adding init" -sh % "touch x y" -sh % "hg ci -A -m 1" == r""" - adding x - adding y""" - -sh % "hg update 0" == "0 files updated, 0 files merged, 2 files removed, 0 files unresolved" -sh % "touch x y" -sh % "hg ci -A -m 2" == r""" - adding x - adding y""" - -sh % "hg merge 1" == r""" - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit)""" -sh % "hg ci -A -m m1" - -sh % "hg update -C 1" == "0 files updated, 0 files merged, 0 files removed, 0 files unresolved" -sh % "hg merge 2" == r""" - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit)""" -sh % "hg ci -A -m m2" - -sh % "cd .." - -sh % "hg clone -r 3 a b" == r""" - adding changesets - adding manifests - adding file changes - added 4 changesets with 3 changes to 3 files - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved""" - -sh % "hg clone -r 4 a c" == r""" - adding changesets - adding manifests - adding file changes - added 4 changesets with 3 changes to 3 files - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved""" - -sh % "hg -R a outgoing b" == r""" - comparing with b - searching for changes - commit: 1ec3c74fc0e0 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: m2""" -sh % "hg -R a outgoing c" == r""" - comparing with c - searching for changes - commit: d15a0c284984 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: m1""" -sh % "hg -R b outgoing c" == r""" - comparing with c - searching for changes - commit: d15a0c284984 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: m1""" -sh % "hg -R c outgoing b" == r""" - comparing with b - searching for changes - commit: 1ec3c74fc0e0 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: m2""" - -sh % "hg -R b pull a" == r""" - pulling from a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 0 changes to 0 files""" - -sh % "hg -R c pull a" == r""" - pulling from a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 0 changes to 0 files"""