Trying to better use uncreat/zombie/orphan terms in tests
Renamed a bunch of tests: - test_forphans_create_* -> test_forphans_uncreat_* - test_forphans_cleanup_opened -> test_forphans_cleanup_open - test_forphans_cleanup_orphaned -> test_forphans_cleanup_uncreat - test_forphans_orphanzombie_fuzz -> test_forphans_uz_fuzz - test_forphans_orphanzombiedir_fuzz -> test_forphans_uzd_fuzz - test_*_oz_fuzz -> test_*_uz_fuzz - test_*_ozd_fuzz -> test_*_uzd_fuzz - test_traversal_*_orphan_* -> test_traversal_*_uncreat_* - test_traversal_*_orphaned -> test_traversal_*_uncreat - test_attrs_fattr_orphan -> test_attrs_fattr_uncreat And renamed a number of variables and things.
This commit is contained in:
+18
-18
@@ -2468,7 +2468,7 @@ code = '''
|
||||
lfsr_unmount(&lfs) => 0;
|
||||
'''
|
||||
|
||||
[cases.test_gc_spam_oz_fuzz]
|
||||
[cases.test_gc_spam_uz_fuzz]
|
||||
defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
|
||||
defines.MKCONSISTENT = [false, true]
|
||||
defines.LOOKAHEAD = [false, true]
|
||||
@@ -2492,7 +2492,7 @@ defines.SEED = 42
|
||||
fuzz = 'SEED'
|
||||
if = '(SIZE*N)/BLOCK_SIZE <= 16'
|
||||
code = '''
|
||||
// test with orphans, zombies, etc
|
||||
// test with uncreats, zombies, etc
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
@@ -2504,7 +2504,7 @@ code = '''
|
||||
|
||||
typedef struct sim_file {
|
||||
lfs_size_t x;
|
||||
bool orphan;
|
||||
bool uncreat;
|
||||
bool zombie;
|
||||
uint32_t prng;
|
||||
lfsr_file_t file;
|
||||
@@ -2527,17 +2527,17 @@ code = '''
|
||||
lfs_size_t x = TEST_PRNG(&prng) % N;
|
||||
|
||||
// already exists?
|
||||
bool orphan = true;
|
||||
bool uncreat = true;
|
||||
uint32_t wprng = 0;
|
||||
for (lfs_size_t j = 0; j < sim_size; j++) {
|
||||
if (sim[j] == x) {
|
||||
orphan = false;
|
||||
uncreat = false;
|
||||
wprng = sim_prngs[j];
|
||||
break;
|
||||
}
|
||||
}
|
||||
// choose a random seed if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
wprng = TEST_PRNG(&prng);
|
||||
}
|
||||
|
||||
@@ -2545,7 +2545,7 @@ code = '''
|
||||
lfs_size_t j = sim_file_count;
|
||||
sim_files[j] = malloc(sizeof(sim_file_t));
|
||||
sim_files[j]->x = x;
|
||||
sim_files[j]->orphan = orphan;
|
||||
sim_files[j]->uncreat = uncreat;
|
||||
sim_files[j]->zombie = false;
|
||||
sim_files[j]->prng = wprng;
|
||||
sim_file_count++;
|
||||
@@ -2557,7 +2557,7 @@ code = '''
|
||||
LFS_O_RDWR | LFS_O_CREAT) => 0;
|
||||
|
||||
// write some initial data if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
uint8_t wbuf[SIZE];
|
||||
for (lfs_size_t k = 0; k < SIZE; k++) {
|
||||
wbuf[k] = 'a' + (TEST_PRNG(&wprng) % 26);
|
||||
@@ -2603,7 +2603,7 @@ code = '''
|
||||
// update related sim files
|
||||
for (lfs_size_t k = 0; k < sim_file_count; k++) {
|
||||
if (sim_files[k]->x == x && !sim_files[k]->zombie) {
|
||||
sim_files[k]->orphan = false;
|
||||
sim_files[k]->uncreat = false;
|
||||
sim_files[k]->prng = wprng;
|
||||
}
|
||||
}
|
||||
@@ -2824,7 +2824,7 @@ code = '''
|
||||
lfsr_unmount(&lfs) => 0;
|
||||
'''
|
||||
|
||||
[cases.test_gc_spam_ozd_fuzz]
|
||||
[cases.test_gc_spam_uzd_fuzz]
|
||||
defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
|
||||
defines.MKCONSISTENT = [false, true]
|
||||
defines.LOOKAHEAD = [false, true]
|
||||
@@ -2848,7 +2848,7 @@ defines.SEED = 42
|
||||
fuzz = 'SEED'
|
||||
if = '(SIZE*N)/BLOCK_SIZE <= 16'
|
||||
code = '''
|
||||
// test with orphans, zombies, dirs, etc
|
||||
// test with uncreats, zombies, dirs, etc
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
@@ -2861,7 +2861,7 @@ code = '''
|
||||
|
||||
typedef struct sim_file {
|
||||
lfs_size_t x;
|
||||
bool orphan;
|
||||
bool uncreat;
|
||||
bool zombie;
|
||||
uint32_t prng;
|
||||
lfsr_file_t file;
|
||||
@@ -2884,20 +2884,20 @@ code = '''
|
||||
lfs_size_t x = TEST_PRNG(&prng) % N;
|
||||
|
||||
// already exists?
|
||||
bool orphan = true;
|
||||
bool uncreat = true;
|
||||
uint32_t wprng = 0;
|
||||
for (lfs_size_t j = 0; j < sim_size; j++) {
|
||||
if (sim[j] == x) {
|
||||
if (sim_isdirs[j]) {
|
||||
goto nonsense;
|
||||
}
|
||||
orphan = false;
|
||||
uncreat = false;
|
||||
wprng = sim_prngs[j];
|
||||
break;
|
||||
}
|
||||
}
|
||||
// choose a random seed if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
wprng = TEST_PRNG(&prng);
|
||||
}
|
||||
|
||||
@@ -2905,7 +2905,7 @@ code = '''
|
||||
lfs_size_t j = sim_file_count;
|
||||
sim_files[j] = malloc(sizeof(sim_file_t));
|
||||
sim_files[j]->x = x;
|
||||
sim_files[j]->orphan = orphan;
|
||||
sim_files[j]->uncreat = uncreat;
|
||||
sim_files[j]->zombie = false;
|
||||
sim_files[j]->prng = wprng;
|
||||
sim_file_count++;
|
||||
@@ -2917,7 +2917,7 @@ code = '''
|
||||
LFS_O_RDWR | LFS_O_CREAT) => 0;
|
||||
|
||||
// write some initial data if we don't exist
|
||||
if (orphan) {
|
||||
if (uncreat) {
|
||||
uint8_t wbuf[SIZE];
|
||||
for (lfs_size_t k = 0; k < SIZE; k++) {
|
||||
wbuf[k] = 'a' + (TEST_PRNG(&wprng) % 26);
|
||||
@@ -2966,7 +2966,7 @@ code = '''
|
||||
// update related sim files
|
||||
for (lfs_size_t k = 0; k < sim_file_count; k++) {
|
||||
if (sim_files[k]->x == x && !sim_files[k]->zombie) {
|
||||
sim_files[k]->orphan = false;
|
||||
sim_files[k]->uncreat = false;
|
||||
sim_files[k]->prng = wprng;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user