Skip to content

Commit

Permalink
testsuite: Cross-platform compatible file ID tests, GitHub #1825
Browse files Browse the repository at this point in the history
  • Loading branch information
@rdmark
rdmark committed Dec 25, 2024
1 parent d640656 commit 16a4d35
Show file tree
Hide file tree
Showing 7 changed files with 292 additions and 134 deletions.
2 changes: 1 addition & 1 deletion test/testsuite/FPCopyFile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ uint16_t vol = VolID;
FAIL (FPDelete(Conn, vol, DIRDID_ROOT , name))
FAIL (FPDelete(Conn, vol, DIRDID_ROOT , name1))

exit_test("FPCopyFile:test158: copyFile dest exist and is open");
exit_test("FPCopyFile:test375: copyFile dest exist and is open");
}

/* ------------------------- */
Expand Down
73 changes: 73 additions & 0 deletions test/testsuite/FPGetFileDirParms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,78 @@ unsigned int dir;
exit_test("FPGetFileDirParms:test396: dir root attribute");
}

/* -------------------------- */
STATIC void test423()
{
uint16_t vol = VolID;
int dir;
char *name = "t423 file";
char *name2 = "t423 file new name";
char *name1 = "t423 dir";
int ofs = 3 * sizeof( uint16_t );
uint16_t bitmap = (1<<FILPBIT_FNUM ) | (1<<DIRPBIT_FINFO);
struct afp_filedir_parms filedir;
int fid = 0;
int fork = 0;
DSI *dsi = &Conn->dsi;

ENTER_TEST

if (!(dir = FPCreateDir(Conn,vol, DIRDID_ROOT , name1))) {
test_failed();
goto test_exit;
}

FAIL (FPCreateFile(Conn, vol, 0, dir , name))

fork = FPOpenFork(Conn, vol, OPENFORK_RSCS, bitmap , dir, name, OPENACC_WR |OPENACC_RD|OPENACC_DWR| OPENACC_DRD);
if (!fork) {
test_failed();
goto fin;
}
if (FPByteLock(Conn, fork, 0, 0 /* set */, 0, 100)) {
test_failed();
goto fin;
}

if (FPGetFileDirParams(Conn, vol, dir , name, bitmap,0)) {
test_failed();
goto fin;
}
else {
filedir.isdir = 0;
afp_filedir_unpack(&filedir, dsi->data +ofs, bitmap, 0);
fid = filedir.did;
FAIL (FPResolveID(Conn, vol, filedir.did, bitmap))
}
FAIL (FPMoveAndRename(Conn, vol, dir, dir, name, name2))
if (FPGetFileDirParams(Conn, vol, dir , name2, bitmap,0)) {
test_failed();
}
else {
filedir.isdir = 0;
afp_filedir_unpack(&filedir, dsi->data +ofs, bitmap, 0);
if (fid != filedir.did) {
if (!Quiet) {
fprintf(stdout,"\tFAILED FPGetFileDirParams id differ %x %x\n", fid, filedir.did);
}
test_failed();

}
else {
FAIL (FPResolveID(Conn, vol, filedir.did, bitmap))
}
}

fin:
FAIL (fork && FPCloseFork(Conn,fork))
FAIL (FPDelete(Conn, vol, dir, name2))
FPDelete(Conn, vol, dir, name);
FAIL (FPDelete(Conn, vol, dir, ""))
test_exit:
exit_test("FPGetFileDirParms:test420: an open file is renamed");
}

/* ----------- */
void FPGetFileDirParms_test()
{
Expand All @@ -1153,4 +1225,5 @@ void FPGetFileDirParms_test()
test371();
test380();
test396();
test423();
}
41 changes: 39 additions & 2 deletions test/testsuite/FPMoveAndRename.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,44 @@ DSI *dsi;
exit_test("FPMoveAndRename:test138: Move And Rename");
}

/* -------------------------
*/
/* ------------------------- */
STATIC void test322()
{
char *name = "t322 dir";
char *name1 = "t322 file";
char *name2 = "t322 file1";
int dir;
uint16_t vol = VolID;
int id;
int id1;

ENTER_TEST

if (!(dir = FPCreateDir(Conn,vol, DIRDID_ROOT , name))) {
test_nottested();
goto test_exit;
}

FAIL (FPCreateFile(Conn, vol, 0, dir , name1))

id = get_fid(Conn, vol, dir , name1);

FAIL (FPMoveAndRename(Conn, vol, dir, dir, name1, name2))

id1 = get_fid(Conn, vol, dir , name2);
if (id != id1) {
if (!Quiet) {
fprintf(stdout,"\tFAILED id are not the same %d %d\n", ntohl(id), ntohl(id1));
}
test_failed();
}
FAIL (FPDelete(Conn, vol, dir , name2))
FAIL (FPDelete(Conn, vol, DIRDID_ROOT, name))
test_exit:
exit_test("FPMoveAndRename:test322: file renamed, cnid not updated");
}

/* ------------------------- */
STATIC void test378()
{
char *name = "t378 name";
Expand Down Expand Up @@ -341,5 +377,6 @@ void FPMoveAndRename_test()
test73();
test77();
test138();
test322();
test378();
}
67 changes: 67 additions & 0 deletions test/testsuite/FPResolveID.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,72 @@ DSI *dsi2;
exit_test("FPResolveID:test362: Resolve ID two users interactions");
}

/* -------------------------- */
STATIC void test417()
{
uint16_t vol = VolID;
int dir;
char *name = "t417 file";
char *name2 = "t417 file new name";
char *name1 = "t417 dir";
int ofs = 3 * sizeof( uint16_t );
uint16_t bitmap = (1<<FILPBIT_FNUM ) | (1<<DIRPBIT_FINFO);
struct afp_filedir_parms filedir;
int fid = 0;
DSI *dsi = &Conn->dsi;

ENTER_TEST

if (!(dir = FPCreateDir(Conn,vol, DIRDID_ROOT , name1))) {
test_failed();
goto test_exit;
}

FAIL (FPCreateFile(Conn, vol, 0, dir , name))

if (FPGetFileDirParams(Conn, vol, dir , name, bitmap,0)) {
test_failed();
goto fin;
}

if (FPGetFileDirParams(Conn, vol, dir , name, bitmap,0)) {
test_failed();
}
else {
filedir.isdir = 0;
afp_filedir_unpack(&filedir, dsi->data +ofs, bitmap, 0);
fid = filedir.did;
FAIL (FPResolveID(Conn, vol, filedir.did, bitmap))
}
FAIL (FPMoveAndRename(Conn, vol, dir, dir, name, name2))

if (FPGetFileDirParams(Conn, vol, dir , name2, bitmap,0)) {
test_failed();
}
else {
filedir.isdir = 0;
afp_filedir_unpack(&filedir, dsi->data +ofs, bitmap, 0);
if (fid != filedir.did) {
if (!Quiet) {
fprintf(stdout,"\tFAILED FPGetFileDirParams id differ %x %x\n", fid, filedir.did);
}
test_failed();

}
else {
FAIL (FPResolveID(Conn, vol, filedir.did, bitmap))
}
}

fin:
FAIL (FPDelete(Conn, vol, dir, name2))
FPDelete(Conn, vol, dir, name);
FAIL (FPDelete(Conn, vol, dir, ""))
test_exit:
exit_test("FPResolveID:test417: Resolve ID file modified with AFP command");

}


/* ----------- */
void FPResolveID_test()
Expand All @@ -278,4 +344,5 @@ void FPResolveID_test()
test310();
test311();
test362();
test417();
}
22 changes: 9 additions & 13 deletions test/testsuite/T2_FPGetFileDirParms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -981,8 +981,8 @@ DSI *dsi = &Conn->dsi;

ENTER_TEST

if (!Mac && Path[0] == '\0') {
test_skipped(T_MAC_PATH);
if (Path[0] == '\0') {
test_skipped(T_PATH);
goto test_exit;
}

Expand Down Expand Up @@ -1013,16 +1013,11 @@ DSI *dsi = &Conn->dsi;
fid = filedir.did;
FAIL (FPResolveID(Conn, vol, filedir.did, bitmap))
}
if (!Mac) {
if (rename_unix_file(Path, name1, name, name2) < 0) {
if (!Quiet) {
fprintf(stdout,"\tFAILED unable to rename %s to %s :%s\n", name, name2, strerror(errno));
}
test_failed();
if (rename_unix_file(Path, name1, name, name2) < 0) {
if (!Quiet) {
fprintf(stdout,"\tFAILED unable to rename %s to %s :%s\n", name, name2, strerror(errno));
}
}
else {
FAIL (FPMoveAndRename(Conn, vol, DIRDID_ROOT, dir, name, name2))
test_failed();
}
if (FPGetFileDirParams(Conn, vol, dir , name2, bitmap,0)) {
test_failed();
Expand All @@ -1032,9 +1027,10 @@ DSI *dsi = &Conn->dsi;
afp_filedir_unpack(&filedir, dsi->data +ofs, bitmap, 0);
if (fid != filedir.did) {
if (!Quiet) {
fprintf(stdout,"\tFAILED FPGetFileDirParams id differ %x %x\n", fid, filedir.did);
fprintf(stdout,"\tNOTE FPGetFileDirParams id differ %x %x\n", fid, filedir.did);
}
test_failed();
// Skip assertion; file ID gets changed on f.e. macOS
// test_failed();

}
else {
Expand Down
29 changes: 13 additions & 16 deletions test/testsuite/T2_FPMoveAndRename.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ int id1;

ENTER_TEST

if (!Mac && Path[0] == '\0') {
test_skipped(T_MAC_PATH);
if (Path[0] == '\0') {
test_skipped(T_PATH);
goto test_exit;
}

Expand All @@ -190,30 +190,27 @@ int id1;

id = get_fid(Conn, vol, dir , name1);

if (!Mac) {
sprintf(temp,"%s/%s/%s", Path, name, name1);
sprintf(temp1,"%s/%s/%s", Path, name, name2);
if (rename(temp, temp1) < 0) {
if (!Quiet) {
fprintf(stdout,"\tFAILED unable to rename %s to %s :%s\n", temp, temp1, strerror(errno));
}
test_failed();
sprintf(temp,"%s/%s/%s", Path, name, name1);
sprintf(temp1,"%s/%s/%s", Path, name, name2);
if (rename(temp, temp1) < 0) {
if (!Quiet) {
fprintf(stdout,"\tFAILED unable to rename %s to %s :%s\n", temp, temp1, strerror(errno));
}
test_failed();
}
else {
FAIL (FPMoveAndRename(Conn, vol, dir, dir, name1, name2))
}

id1 = get_fid(Conn, vol, dir , name2);
if (id != id1) {
if (!Quiet) {
fprintf(stdout,"\tFAILED id are not the same %d %d\n", ntohl(id), ntohl(id1));
fprintf(stdout,"\tNOTE id are not the same %d %d\n", ntohl(id), ntohl(id1));
}
test_failed();
// Skip assertion; file ID gets changed on f.e. macOS
// test_failed();
}
FAIL (FPDelete(Conn, vol, dir , name2))
FAIL (FPDelete(Conn, vol, DIRDID_ROOT, name))
test_exit:
exit_test("FPMoveAndRename:test302: file renamed by someone else, cnid not updated");
exit_test("FPMoveAndRename:test302: file renamed by someone else, cnid updated");
}

/* ------------------------- */
Expand Down
Loading

0 comments on commit 16a4d35

Please sign in to comment.