Skip to content

Commit caecc40

Browse files
Anton-4Anton-4
committed
more robust regex
1 parent 2c68319 commit caecc40

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

‎ci/expect_scripts/path-test.exp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ expect "Testing Path functions..." {
4141

4242
# Test Path directory operations
4343
expect "Testing Path directory operations:" {
44-
expect -re "Created directory: drwxr-xr-x \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_single_dir" {
44+
expect -re "Created directory: drwxr-xr-x \\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ test_single_dir" {
4545
expect "Is a directory: Bool.true" {
4646
expect "" {
4747
expect "Nested directory structure:" {
@@ -52,15 +52,15 @@ expect "Testing Path functions..." {
5252
expect "Number of directories created: 3" {
5353
expect "Directory contents:" {
5454
expect -re "total \\d+" {
55-
expect -re "drwxr-xr-x +\\d+ \\w+ \\w+ +\\d+ \\w+ +\\d+ \\d+:\\d+ \\." {
56-
expect -re "drwxrwxr-x \\d+ \\w+ \\w+ +\\d+ \\w+ +\\d+ \\d+:\\d+ \\.\\." {
57-
expect -re "-rw-r--r-- +\\d+ \\w+ \\w+ +\\d+ \\w+ +\\d+ \\d+:\\d+ file1\\.txt" {
58-
expect -re "-rw-r--r-- +\\d+ \\w+ \\w+ +\\d+ \\w+ +\\d+ \\d+:\\d+ file2\\.txt" {
59-
expect -re "drwxr-xr-x +\\d+ \\w+ \\w+ +\\d+ \\w+ +\\d+ \\d+:\\d+ subdir" {
55+
expect -re "dr\[-rwx\]+ +\\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ \\." {
56+
expect -re "dr\[-rwx\]+ +\\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ \\.\\." {
57+
expect -re "-\[-rwx\]+ +\\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ file1\\.txt" {
58+
expect -re "-\[-rwx\]+ +\\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ file2\\.txt" {
59+
expect -re "dr\[-rwx\]+ +\\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ subdir" {
6060
expect "" {
6161
expect "Empty dir exists before delete: Bool.true" {
6262
expect "Empty dir exists after delete: Bool.false" {
63-
expect -re "Size before delete_all: \\d+\\w*\\s+test_parent" {
63+
expect -re "Size before delete_all: \\d+\\w*\\s*test_parent" {
6464
expect "" {
6565
expect "Parent dir exists after delete_all: Bool.false" {
6666
expect "" {
@@ -73,8 +73,8 @@ expect "Testing Path functions..." {
7373
expect "Link content: Original content for Path hard link test" {
7474
expect "Content matches: Bool.true" {
7575
expect "Inode information:" {
76-
expect -re "\\d+ -rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_hardlink\\.txt" {
77-
expect -re "\\d+ -rw-r--r-- \\d+ \\w+ \\w+ \\d+ \\w+ +\\d+ \\d+:\\d+ test_path_original\\.txt" {
76+
expect -re "\\d+ -rw-r--r-- \\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ test_path_hardlink\\.txt" {
77+
expect -re "\\d+ -rw-r--r-- \\d+ \\w+ (\\w+ )? *\\d+ \\w+ +\\d+ \\d+:\\d+ test_path_original\\.txt" {
7878
expect "" {
7979
expect -re "First file inode: \\\[\"\\d+\"\\\]" {
8080
expect -re "Second file inode: \\\[\"\\d+\"\\\]" {

0 commit comments

Comments
 (0)