tests: default to 'sid' codename for 'unstable'

Git-Dch: Ignore

test/integration/framework

@@ -662,7 +662,12 @@ compressfile() {
 }
 
 # can be overridden by testcases for their pleasure
-getcodenamefromsuite() { echo -n "$1"; }
+getcodenamefromsuite() {
+	case "$1" in
+	unstable) echo 'sid';;
+	*) echo -n "$1";;
+	esac
+}
 getreleaseversionfromsuite() { true; }
 getlabelfromsuite() { true; }
 

test/integration/test-ubuntu-bug-784473-InRelease-one-message-only

@@ -35,5 +35,5 @@ testequal "Package files:
  100 ${ROOTDIR}/rootdir/var/lib/dpkg/status
      release a=now
  500 file:${ROOTDIR}/aptarchive/ unstable/main i386 Packages
-     release a=unstable,n=unstable,c=main
+     release a=unstable,n=sid,c=main
 Pinned packages:" aptcache policy