rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-06 21:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove parent_id from the restored branch

Browse Source
This commit is contained in:
Alexey Masterov
2025-07-22 11:04:08 +02:00
parent c3a7158e62
commit 7423c393c6
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test_runner/random_ops/test_random_ops.py
View File

@@ -370,9 +370,7 @@ class NeonProject:
return target
def get_random_parent_branch(self) -> NeonBranch:
return self.branches[
random.choice(list(set(self.branches.keys()) - self.reset_branches))
]
return self.branches[random.choice(list(set(self.branches.keys()) - self.reset_branches))]
def generate_branch_name(self) -> str:
self.branch_num += 1
@@ -526,11 +524,10 @@ class NeonProject:
)
self.wait()
new_branch_def = self.neon_api.get_branch_details(self.id, new_branch_def["branch"]["id"])
new_branch_def["branch"].pop("parent_id")
# XXX do not merge, debug only
log.info("new_branch: %s", new_branch_def)
new_branch = NeonBranch(
self, new_branch_def
)
new_branch = NeonBranch(self, new_branch_def)
target_branch_def = self.neon_api.get_branch_details(self.id, target_branch.id)
if "name" in target_branch_def["branch"]:
target_branch.name = target_branch_def["branch"]["name"]